# HG changeset patch # User hgs # Date 1287136726 -10800 # Node ID baacf668fe89bc787a5310d9d1452ded22e38825 # Parent cfea66083b62e7b362699e2e5eb75bdeb402d82f 201041 diff -r cfea66083b62 -r baacf668fe89 package_definition.xml --- a/package_definition.xml Mon Oct 04 16:06:10 2010 +0300 +++ b/package_definition.xml Fri Oct 15 12:58:46 2010 +0300 @@ -37,7 +37,7 @@ - + diff -r cfea66083b62 -r baacf668fe89 phone_plat/phone_application_commands_api/inc/phoneappcommands.hrh --- a/phone_plat/phone_application_commands_api/inc/phoneappcommands.hrh Mon Oct 04 16:06:10 2010 +0300 +++ b/phone_plat/phone_application_commands_api/inc/phoneappcommands.hrh Fri Oct 15 12:58:46 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -84,9 +84,6 @@ EPhoneInCallCmdCancelSendingDtmfString, EPhoneInCallCmdContinueSendingDtmfString, EPhoneInCallCmdVoiceMode, - EPhoneInCallCmdSendToCallerMenu, - EPhoneInCallCmdSendNew, - EPhoneInCallCmdSendFile, EPhoneInCallCmdDrop, EPhoneInCallCmdPrivate, EPhoneInCallCmdDialer, diff -r cfea66083b62 -r baacf668fe89 phone_plat/telephony_menu_extension_api/inc/xqteluicommandextension.h --- a/phone_plat/telephony_menu_extension_api/inc/xqteluicommandextension.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phone_plat/telephony_menu_extension_api/inc/xqteluicommandextension.h Fri Oct 15 12:58:46 2010 +0300 @@ -75,6 +75,10 @@ class ToolBarCommand { public: + ToolBarCommand() : + mCommandId(0), mIsEnabled(false) {} + ToolBarCommand(int command, bool isEnabled) : + mCommandId(command), mIsEnabled(isEnabled) {} // Tool Bar command Id int mCommandId; @@ -82,6 +86,10 @@ // Is command enabled bool mIsEnabled; + // Comparison operator + bool operator==(const ToolBarCommand& c) + { return ((c.mCommandId == mCommandId) && + (c.mIsEnabled == mIsEnabled)); } }; /*! diff -r cfea66083b62 -r baacf668fe89 phoneapp/phonemediatorcenter/tsrc/ut_mediatorfactory/group/ut_mediatorfactory.mmp --- a/phoneapp/phonemediatorcenter/tsrc/ut_mediatorfactory/group/ut_mediatorfactory.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phonemediatorcenter/tsrc/ut_mediatorfactory/group/ut_mediatorfactory.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -57,3 +57,4 @@ LIBRARY euser.lib LIBRARY phoneuiutils.lib +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phonemediatorcenter/tsrc/ut_mediatormessagefactory/group/T_MediatorMessageFactory.mmp --- a/phoneapp/phonemediatorcenter/tsrc/ut_mediatormessagefactory/group/T_MediatorMessageFactory.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phonemediatorcenter/tsrc/ut_mediatormessagefactory/group/T_MediatorMessageFactory.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -51,4 +51,4 @@ LIBRARY EUnitUtil.lib LIBRARY euser.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phonemediatorcenter/tsrc/ut_mediatorsender/group/T_MediatorSender.mmp --- a/phoneapp/phonemediatorcenter/tsrc/ut_mediatorsender/group/T_MediatorSender.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phonemediatorcenter/tsrc/ut_mediatorsender/group/T_MediatorSender.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -53,3 +53,5 @@ LIBRARY EUnitUtil.lib LIBRARY euser.lib LIBRARY phoneuiutils.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/bwins/phoneringingtoneplayeru.def --- a/phoneapp/phoneringingtoneplayer/bwins/phoneringingtoneplayeru.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneringingtoneplayer/bwins/phoneringingtoneplayeru.def Fri Oct 15 12:58:46 2010 +0300 @@ -1,7 +1,7 @@ EXPORTS - ?StopPlaying@CPhoneRingingToneController@@QAEXXZ @ 1 NONAME ; void CPhoneRingingToneController::StopPlaying(void) - ?PlayRingToneL@CPhoneRingingToneController@@QAEXPAVTPhoneCommandParam@@@Z @ 2 NONAME ; void CPhoneRingingToneController::PlayRingToneL(class TPhoneCommandParam *) - ?NewL@CPhoneRingingToneController@@SAPAV1@XZ @ 3 NONAME ; class CPhoneRingingToneController * CPhoneRingingToneController::NewL(void) - ?MuteRingingToneOnAnswer@CPhoneRingingToneController@@QAEXXZ @ 4 NONAME ; void CPhoneRingingToneController::MuteRingingToneOnAnswer(void) - ?MuteRingingTone@CPhoneRingingToneController@@QAEXXZ @ 5 NONAME ; void CPhoneRingingToneController::MuteRingingTone(void) + ?StopPlayingL@RPhoneToneClient@@QAEXXZ @ 1 NONAME ; void RPhoneToneClient::StopPlayingL(void) + ??0RPhoneToneClient@@QAE@XZ @ 2 NONAME ; RPhoneToneClient::RPhoneToneClient(void) + ?Connect@RPhoneToneClient@@QAEHXZ @ 3 NONAME ; int RPhoneToneClient::Connect(void) + ??1RPhoneToneClient@@QAE@XZ @ 4 NONAME ; RPhoneToneClient::~RPhoneToneClient(void) + ?PlayRingingToneL@RPhoneToneClient@@QAEXPAVTPhoneCommandParam@@@Z @ 5 NONAME ; void RPhoneToneClient::PlayRingingToneL(class TPhoneCommandParam *) diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/eabi/phoneringingtoneplayeru.def --- a/phoneapp/phoneringingtoneplayer/eabi/phoneringingtoneplayeru.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneringingtoneplayer/eabi/phoneringingtoneplayeru.def Fri Oct 15 12:58:46 2010 +0300 @@ -1,11 +1,9 @@ EXPORTS - _ZN27CPhoneRingingToneController11StopPlayingEv @ 1 NONAME - _ZN27CPhoneRingingToneController13PlayRingToneLEP18TPhoneCommandParam @ 2 NONAME - _ZN27CPhoneRingingToneController15MuteRingingToneEv @ 3 NONAME - _ZN27CPhoneRingingToneController23MuteRingingToneOnAnswerEv @ 4 NONAME - _ZN27CPhoneRingingToneController4NewLEv @ 5 NONAME - _ZTI17CPhoneAudioPlayer @ 6 NONAME ; ## - _ZTI17CPhoneRingingTone @ 7 NONAME ; ## - _ZTV17CPhoneAudioPlayer @ 8 NONAME ; ## - _ZTV17CPhoneRingingTone @ 9 NONAME ; ## + _ZN16RPhoneToneClient12StopPlayingLEv @ 1 NONAME + _ZN16RPhoneToneClient16PlayRingingToneLEP18TPhoneCommandParam @ 2 NONAME + _ZN16RPhoneToneClient7ConnectEv @ 3 NONAME + _ZN16RPhoneToneClientC1Ev @ 4 NONAME + _ZN16RPhoneToneClientC2Ev @ 5 NONAME + _ZN16RPhoneToneClientD1Ev @ 6 NONAME + _ZN16RPhoneToneClientD2Ev @ 7 NONAME diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/group/bld.inf --- a/phoneapp/phoneringingtoneplayer/group/bld.inf Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneringingtoneplayer/group/bld.inf Fri Oct 15 12:58:46 2010 +0300 @@ -22,7 +22,7 @@ DEFAULT PRJ_EXPORTS -../rom/phoneringingtoneplayer_stub.sis /epoc32/data/z/system/install/phoneringingtoneplayer_stub.sis + PRJ_MMPFILES phoneringingtoneplayer.mmp diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/group/phoneringingtoneplayer.mmp --- a/phoneapp/phoneringingtoneplayer/group/phoneringingtoneplayer.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneringingtoneplayer/group/phoneringingtoneplayer.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -18,13 +18,11 @@ #include // Capability assignment. -CAPABILITY ALL -TCB +CAPABILITY ALL -TCB // Assign Vendor ID. VENDORID VID_DEFAULT -VERSION 10.0 - TARGET phoneringingtoneplayer.dll TARGETTYPE dll UID 0x1000008d 0x2002134E @@ -32,11 +30,10 @@ SOURCEPATH ../src -SOURCE cphoneaudioplayer.cpp -SOURCE cphoneringingtone.cpp -SOURCE cphoneringingtonecontroller.cpp -SOURCE cphoneringingtoneplayer.cpp -SOURCE cphonettsplayer.cpp +SOURCE cphonetoneserver.cpp +SOURCE rphonetoneclient.cpp +SOURCE cphonetoneserversession.cpp +SOURCE cphonetoneserverplaybackcontroller.cpp /* Languages */ LANG SC diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphoneaudioplayer.h --- a/phoneapp/phoneringingtoneplayer/inc/cphoneaudioplayer.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,355 +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 CPHONEAUDIOPLAYER_H -#define CPHONEAUDIOPLAYER_H - -// System includes -#include -#include -#include - -// Forward declarations -class MPhoneAudioPlayerObserver; -class C3DRingingToneInterface; -class CPhoneRingingTone; -class CAudioOutput; - -/** -* Audio player for playing audio sample or tone file. -* -* @since 1.0 -*/ -class CPhoneAudioPlayer : - public CBase, - private MMdaAudioPlayerCallback, - private MMdaAudioToneObserver - { - public: - - enum TAudioPlayerStatus - { - EToneLoading, - EToneReady, - ETonePlaying - }; - - enum TRingingType - { - ETypeRinging, - ETypeRingingOnce, - ETypeAscending - }; - - public: // Constructors and destructor - - /** - * Two-phased constructor. - * @param aRingingTone The ringing tone - * @param aPriority The priority for the playing - * @param aPreference The preference value - * @param aObserver Audio player observer - * @param aId The id of this audio player - * @param aMdaServer The reference to media server - * @param aExtSecNeeded ETrue if DRM extend security is needed - * @return The instance of the audio player. - */ - static CPhoneAudioPlayer* NewL( - const CPhoneRingingTone& aRingingTone, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId = 0, - CMdaServer* aMdaServer = NULL, - TBool aExtSecNeeded = EFalse ); - - /** - * Two-phased constructor. - * @param aRingingTone The ringing tone - * @param aPriority The priority for the playing - * @param aPreference The preference value - * @param aObserver Audio player observer - * @param aId The id of this audio player - * @param aMdaServer The reference to media server - * @param aExtSecNeeded ETrue if DRM extend security is needed - * @return The instance of the audio player. NULL if the function fails. - */ - static CPhoneAudioPlayer* New( - const CPhoneRingingTone& aRingingTone, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId = 0, - CMdaServer* aMdaServer = NULL, - TBool aExtSecNeeded = EFalse ); - - /** - * Two-phased constructor. - * @param aFileName The ringing tone file name. - * @param aPriority The priority for the playing - * @param aPreference The preference value - * @param aObserver Audio player observer - * @param aId The id of this audio player - * @param aMdaServer The reference to media server - * @param aExtSecNeeded ETrue if DRM extend security is needed - * @return The instance of the audio player. - */ - static CPhoneAudioPlayer* NewL( - const TDesC& aFileName, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId = 0, - CMdaServer* aMdaServer = NULL, - TBool aExtSecNeeded = EFalse ); - - /** - * Two-phased constructor, take audio from descriptor. - * - * @param aSequence sequence to be played. - * @param aPriority priority of tone. - * @param aPreference preference of tone. - * @param aObserver observer. - * @param aId identifier, used in observer interface - * calls. - * @param aMdaServer The reference to media server - */ - static CPhoneAudioPlayer* NewSeqL( - const TDesC8& aSequence, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId = 0, - CMdaServer* aMdaServer = NULL ); - - /** - * Two-phased constructor, takes Text-To-Speech text to be played. - * @since Series 60 3.0 - * @param aText Text to be pronounced. - * @param aPriority priority of tone. - * @param aPreference preference of tone. - * @param aObserver observer. - * @param aId identifier, used in observer interface - * calls. - */ - static CPhoneAudioPlayer* NewTtsL( - const TDesC& aText, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId = 0); - - /** - * Destructor. - */ - ~CPhoneAudioPlayer(); - - public: // new function - - /** - * Play the audio file or tone - * @param aRingingType - * @param aVolume take value from 1 to 10 - * @param aTTsToBePlayed - */ - void Play( - TRingingType aRingType, - TInt aVolume, - TBool aTTsToBePlayed ); - - /** - * Stop current file playing - */ - void StopPlaying(); - - - /** - * Sets new volumes and ramptimes. - * @param aVolume -volume to be set - * @param aRamptime -ramptime to be set. - */ - void SetNewVolumeAndRamptime( TInt aVolume, TInt aRamptime ); - - /** - * Re starts playing. - */ - void ReStartPlaying(); - /** - * Enable or disable TTs playing. - * @param aTTsToBePlayed - */ - void SetTTsToBePlayed( TBool aTTsToBePlayed ); - - /** - * Sets volume level to zero. - * @since Series 60 3.1 - */ - void MutePlaying(); - - - private: //from base class - - /** - * from MMdaAudioPlayerCallback - */ - virtual void MapcInitComplete( - TInt aError, - const TTimeIntervalMicroSeconds& aDuration ); - - /** - * from MMdaAudioPlayerCallback - */ - virtual void MapcPlayComplete( TInt aError ); - - /** - * from MMdaAudioToneObserver - */ - virtual void MatoPrepareComplete(TInt aError); - - /** - * from MMdaAudioToneObserver - */ - virtual void MatoPlayComplete(TInt aError); - - private: - - enum TAudioDataFormat - { - EFormatTone, - EFormatSample, - EFormatTts // Text-To-Speech - }; - - /** - * C++ constructor. - */ - CPhoneAudioPlayer( - TAudioDataFormat aDataFormat, - MPhoneAudioPlayerObserver& aObserver, - TInt aPriority, - TUint aPreference, - TInt aId ); - - /** - * Symbian OS constructor. - */ - void ConstructL( - const TDesC& aFileName, CMdaServer* aMdaServer ); - - /** - * Symbian OS constructor. - */ - void ConstructSeqL( - const TDesC8& aSequence, - CMdaServer* aMdaServer ); - - /** - * Symbian OS constructor for the Text-To-Speech option - * @since Series 60 3.0 - */ - void ConstructTtsL( - const TDesC& aTtsText, - TInt aPriority, - TUint aPreference ); - - /** - * Do the playing stuff - */ - void DoPlay(); - - /** - * Ser tinging type properties - */ - void SetRingingTypeProperties(); - - /** - * Call back function for timer - */ - static TInt TimerCallBack( TAny* aAny ); - - /** - * Handle timer events - */ - void HandleTimerEvent(); - - /* - * Convert volume to the scale used by hardware - * @param aVolume volume to be altered - * @return TInt new volume - */ - TInt ConvertVolume( TInt aVolume ); - - private: // Data - - // The format of audio data, audio sample file or tone file - TAudioDataFormat iFormat; - - // Observer for error handling - MPhoneAudioPlayerObserver& iObserver; - - // Priority. It's only used in playing tone file - const TInt iPriority; - // Preference. Only used for tone file - const TUint iPreference; - - // Identifier number - TInt iId; - - // Player for tone file. - CMdaAudioToneUtility* iTonePlayer; - - // Player for audio file. - CMdaAudioPlayerUtility* iSamplePlayer; - - // Player for the Text-To-Speech texts - CMdaAudioPlayerUtility* iTtsPlayer; - - // The status of the player - TAudioPlayerStatus iPlayerStatus; - - // How does the file played. It's only used if the player - // is playing the file - TRingingType iRingType; - - // Volume - TInt iVolume; - - // For ascending and descending used for set current volume - TInt iCurrentVolume; - - // Used by sample player - TBool iToBePlaying; - - // Store for sequence. - HBufC8* iSequence; - - // Store for the TTS source string - HBufC8* iTtsText; - - // 3D Audio ringing tone plugin - C3DRingingToneInterface* i3DPlugin; - - // Flag to indicate whether we need to play TTs or not - TBool iTTsToBePlayed; - - // Ringingtone output - CAudioOutput* iAudioOutput; - }; - -#endif // CPHONEAUDIOPLAYER_H - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphoneringingtone.h --- a/phoneapp/phoneringingtoneplayer/inc/cphoneringingtone.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,229 +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 CPHONERINGINGTONE_H -#define CPHONERINGINGTONE_H - -// INCLUDES -#include -#include - -// CONSTANTS - -// MACROS - -// DATA TYPES - -// FUNCTION PROTOTYPES - -// FORWARD DECLARATIONS - -// CLASS DECLARATION - -/** -* Ringing tone -* Wrapper for file name. In addtion, provides methods -* for ringing tone type identification. -* -* @lib Phone.app -* @since Series 60 3.1 -*/ -class CPhoneRingingTone : public CBase - { - public: // Constructors and destructor - - /** - * Two-phased constructor. - * @param aFileName Ringing tone file name with path. - * @param aDrmInPlayback ETrue to use IsFileDrmProtected(). - */ - static CPhoneRingingTone* NewL( - const TDesC& aFileName, - TBool aDrmInPlayback = EFalse ); - - /** - * Destructor. - */ - virtual ~CPhoneRingingTone(); - - public: // New functions - - - /** - * Sets the file name including path. - * @since Series 60 3.1 - * @param aFileName file name plus path. - */ - void SetFileName( const TDesC& aFileName ); - - /** - * Returns file name including path. - * @since Series 60 3.1 - * @return File name. - */ - const TDesC& FileName() const; - - /** - * Returns MIME type. - * @since Series 60 3.1 - * @return MIME type. - */ - const TDesC& MimeType() const; - - /** - * Checks if video ringing tone. - * @since Series 60 3.1 - * @return ETrue if video ringing tone. - */ - TBool IsVideoRingingTone(); - - /** - * Checks if the file is a DCF file. - * @since Series 60 3.1 - * @return ETrue if files is DRM protected. - */ - TBool IsFileDrmProtected() const; - - /** - * Checks if the file is in ROM. - * @since Series 60 3.1 - */ - TBool IsFileInRom() const; - - /** - * Set profile's ringing type - * @since Series 60 5.0 - */ - void SetRingingType( TProfileRingingType aRingingType); - - /** - * Return ringing type of current ringingtone - * @since Series 60 5.0 - */ - TProfileRingingType RingingType() const; - - /** - * Set profile's ringingtone volume - * @since Series 60 5.0 - */ - void SetVolume( const TInt aVolume ); - - /** - * Return volume of current ringingtone - * @since Series 60 5.0 - */ - TInt Volume() const; - - /** - * Set profile's TTS value - * @since Series 60 5.0 - */ - void SetTtsToneToBePlayed( TBool aTtsToneToBePlayed ); - - /** - * Return TTS status of current profile - * @since Series 60 5.0 - */ - TBool TtsToneToBePlayed() const; - - /** - * Checks if ringing tone file's size is larger than the size limit. - * If size limit is exceeded, default tone is played instead. - * @since 3.1 - * @param aRingingTone Tone to check. - * @return EFalse if the limit was exceeded and thus default tone played. - * ETrue if tone file's size was valid and the checked tone - * can be played. - */ - TBool CheckAndHandleToneSizeLimit(); - - /** - * Checks if ringing tone file's size is larger than the size limit. - * @since 3.1 - * @param aFile File to check. - * aSizeLimitKB the size limit in kB is set to this variable. - * @return KErrNone if the file can be used as a ringing tone. - * KErrTooBig if the file size limit is exceeded. - * Other error value if error happened during size checking. - */ - TInt CheckToneFileSize( const TDesC& aFile, TInt aSizeLimitKB ); - - /** - * Reads from central repository the file size limit of following tones: - * -contact's personal ringing tone - * -voice call line1 - * -voice call line2 - * Value 0 means all sizes are allowed. - * @since 3.1 - * @return leaves on error. - */ - void GetMaxToneFileSize(); - - private: - - /** - * Refresh MIME type. This must be called - * before using MimeType(). - */ - TInt RefreshMime(); - - /** - * Refresh MIME type. - */ - void RefreshMimeL(); - - /** - * Checks if file is located in video directory. - */ - TBool IsFileInVideoDirectory() const; - - private: - - /** - * C++ default constructor. - */ - CPhoneRingingTone( TBool aDrmInPlayback ); - - /** - * By default Symbian 2nd phase constructor is private. - */ - void ConstructL( const TDesC& aFileName ); - - private: // Data - - // File name with path - HBufC* iFileName; - - // MIME type - HBufC* iMimeType; - - // Extended security - TBool iDrmInPlayback; - - TProfileRingingType iRingingType; - - TInt iVolume; - - // Voice call ringing tone file size max value. - TInt iToneFileSizeLimitKB; - - TBool iTtsToneToBePlayed; - }; - -#endif // CPHONERINGINGTONE_H - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphoneringingtonecontroller.h --- a/phoneapp/phoneringingtoneplayer/inc/cphoneringingtonecontroller.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,248 +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 CPHONERINGINGTONECONTROLLER_H -#define CPHONERINGINGTONECONTROLLER_H - -// INCLUDES -#include -#include -#include "mphoneaudioplayerobserver.h" -#include "mphonevideoplayerobserver.h" -#include "mphonecoveruiobserver.h" -#include "cphoneaudioplayer.h" -#include "mphonetimer.h" -#include "mphonevideoplayer.h" -#include "cphonemediatorsender.h" - -// FORWARD DECLARATIONS -//class MPhoneRingingToneObserver; -class CPhoneAudioPlayer; -class CPhoneRingingtonePlayer; -class CPhoneTTSPlayer; -class MPhoneDisplayProvider; -class CPhoneRingingTone; -class TPhoneCommandParam; - -// CLASS DECLARATION - -/** -* It implements ringing tone functionality. -* Note that when issuing Play-command to audio side, ALWAYS set the tone type -* before the Play() is called. This is to ensure that correct tone is tried to -* be played. -* -* @since 1.0 -*/ -NONSHARABLE_CLASS(CPhoneRingingToneController) : - public CBase, - private MPhoneVideoPlayerObserver, - private MPhoneCoverUiObserver - { - public: - // States for this active object - enum TState - { - EIdleState, - EDeletingAudioPlayer, - EDeletingVideoPlayer, - EPlayingDefaultVideo - }; - - public: - - /** - * Two-phased constructor. - * @return new instance. - */ - IMPORT_C static CPhoneRingingToneController* NewL(); - - /** - * Destructor. - */ - ~CPhoneRingingToneController(); - - /** - * Play ring tone - * @param aCommandParam a command param - */ - IMPORT_C void PlayRingToneL( TPhoneCommandParam *aCommandParam ); - - /** - * Stops playing the ringing tone. - * Method does not do anything if ringing tone is not playing. - */ - IMPORT_C void StopPlaying(); - - /** - * Continues video playback ( and ringing tone ) with volume 0 - * Stream not closed ( If music player was ongoing ) - */ - IMPORT_C void MuteRingingToneOnAnswer(); - - /** - * Continues video playback with muted audio. - * Ringing tone is stopped. - */ - IMPORT_C void MuteRingingTone(); - - - /** - * Sets video player. - * @since Series 60 v3.2 - * @param aVideoPlayer Video player reference. - */ - void SetVideoPlayer( MPhoneVideoPlayer* aVideoPlayer ); - - /** - * Play video ring tone. - * @since Series 60 3.1 - * @param aRingingTone Ringing tone to be played. - * @param aVolume Volume used to play the ringing tone. - * @param aRingingType Ringing type. - */ - void PlayVideoRingingTone( - const CPhoneRingingTone& aRingingTone, - TInt aVolume, - TProfileRingingType aRingingType, - TBool aPersonalTone = EFalse ); - - /** - * Checks if extended security required. - * @since Series 60 3.1 - * @return ETrue if extended security is required. - */ - TBool ExtendedSecurity() const; - - - /** - * Command when necessary Cover UI to play video ringing tone. - * return ETrue if Cover ui handle video ringing tone playing. - * return EFalse if Phone must handle video ringing tone playing. - */ - TBool CoverUIPlayVideoRingingToneL( - const CPhoneRingingTone& aRingingTone ); - - /** - * This function is called when Mediator receives response to the sent - * ShowMultiMediaRingingTone command. - * @param aStatus - Standard Symbian error code indicating the - * success of the command. - */ - void ShowMultimediaRingingToneResponseL( TInt aStatus ); - - private: // from MPhoneVideoPlayerObserver - - /** - * HandleVideoPlayerError - */ - virtual void HandleVideoPlayerError( - TPhoneVideoPlayerErrorEvent aEvent, - TInt aError ); - - /** - * HandleVideoPlayerInitComplete - */ - virtual void HandleVideoPlayerInitComplete(); - - /** - * HandleVideoPlayerPlayingComplete - */ - virtual void HandleVideoPlayerPlayingComplete(); - - private: - - /** - * C++ default constructor. - */ - CPhoneRingingToneController(); - - /** - * By default Symbian OS constructor is private. - */ - void ConstructL(); - - - /** - * Convert ringing type from PhoneAppEnging to the ringing type in - * MPhoneVideoPlayer. - * @since Series 60 3.1 - * @param aRingingType the ringing type form PhoneAppEngine. - * @return ringing type of MPhoneVideoPlayer. - */ - MPhoneVideoPlayer::TPlayMode ConvertVideoRingingType( - TProfileRingingType aRingingType ); - - - /** - * Plays default L1 or L2 video ring tone asynchronously. - * @since Series 60 3.1 - */ - void PlayDefaultVideoAsync(); - - /** - * Deletes video player and plays default L1 or L2 - * tone asynchronously. - * @since Series 60 3.1 - */ - void DeleteVideoPlayerAndPlayDefaultAsync(); - - /** - * Mutes the ringing tone. - */ - void DoMuteRingingTone(); - - /** - * Play audio ring tone - */ - void PlayAudioRingTone( - TInt aVolume, - TProfileRingingType aRingingType ); - - - private: // Data - - // Audio/Video tone - CPhoneRingingTone* iAudioVideoRingingTone; - - // Volume for backup tone playing. - TInt iVolume; - - // Ringing type for backup tone playing. - TProfileRingingType iRingingType; - - // Video ringing tone player - MPhoneVideoPlayer* iVideoPlayer; - - // Pointer to Mediator Sender - CPhoneMediatorSender* iMediatorSender; - - // Active Cover UI command EPhoneCoverUiShowMultimediaRingingTone - TBool iActiveCoverUICommand; - - // Flag. Indicates video scaling capability of the device. - TBool iArbitraryVideoScaling; - - CPhoneRingingtonePlayer* iRingingtonePlayer; - - CPhoneTTSPlayer* iTTSPlayer; - - }; - -#endif // CPHONERINGINGTONECONTROLLER_H - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphoneringingtoneplayer.h --- a/phoneapp/phoneringingtoneplayer/inc/cphoneringingtoneplayer.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,371 +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 CPHONERINGINGTONEPLAYER_H_ -#define CPHONERINGINGTONEPLAYER_H_ - -// System includes -#include -#include - -// User includes -#include "mphoneaudioplayerobserver.h" -#include "cphoneaudioplayer.h" -#include "mphonevideoplayer.h" -#include "mphonecenrepobserver.h" -#include "mphonetimer.h" - -// Forward declarations -class CPhoneTimer; -class CPhoneRingingTone; - - -NONSHARABLE_CLASS(CPhoneRingingtonePlayer) : public CActive, - public MPhoneAudioPlayerObserver, - public MPhoneCenRepObserver, - private MPhoneTimer - { -public: - CPhoneRingingtonePlayer(); - virtual ~CPhoneRingingtonePlayer(); - - - /** - * Two-phased constructor. - * @return new instance. - */ - static CPhoneRingingtonePlayer* NewL(); - - /** - * Playing ringing tone based on profile. - * @param aAudioVideoRingingTone - */ - void PlayProfileBasedTone( CPhoneRingingTone* aAudioVideoRingingTone ); - - /** - * Playing the Beep once. - * @param aVolume volume used to play the ringing tone. - */ - void PlayBeepOnce( TInt aVolume ); - - /** - * Play silent tone. No_sound.wav will be played. If vibration alert - * is ON, it will vibrate. - */ - void PlaySilentTone(); - - /** - * Play video ring tone. - * @since Series 60 3.1 - * @param aRingingTone Ringing tone to be played. - * @param aVolume Volume used to play the ringing tone. - * @param aRingingType Ringing type. - */ - void PlayVideoRingingTone( - const CPhoneRingingTone& aRingingTone, - TInt aVolume, - TProfileRingingType aRingingType, - TBool aPersonalTone = EFalse ); - - /** - * Play default tone. - * @param aVolume volume used for the playing. - * @param aRingingType ringing type. - */ - void PlayDefaultTone( - TInt aVolume, - TProfileRingingType aRingingType ); - - /** - * Play backup tone. - * @param aVolume volume used for the playing. - * @param aRingingType ringing type. - */ - void PlayBackupTone( - TInt aVolume, - TProfileRingingType aRingingType ); - - /** - * Stops playing the ringing tone. - * Method does not do anything if ringing tone is not playing. - */ - void StopPlaying(); - - /** - * Enumerates identifiers for each player: - * EPlayerAudio - audio - * EPlayerBeepOnce - beep once - * EPlayerSilent - silent - * EPlayerDefault - default - * EPlayerBackup - backup - * - * EPlayerFirst and EPlayerLast are alias - * to other identifiers. - * EPlayerFirst - first player - * EPlayerLast - last player - */ - enum TPlayerId - { - EPlayerFirst, - EPlayerAudio = EPlayerFirst, - EPlayerBeepOnce, - EPlayerSilent, - EPlayerDefault, - EPlayerBackup, - EPlayerTts, - EPlayerLast = EPlayerTts, - EPlayerCount - }; - - CPhoneAudioPlayer* GetCurrentlyActiveAudioPlayer(); - - void MuteActiveAudioPlayer(); - -public: // From MPhoneCenRepObserver - - /** - * Handle the change of the setting from Central Repository - * @param aUid identifing the central repository UID. - * @param aId central repository ID. - */ - virtual void HandleCenRepChangeL( - const TUid& aUid, - const TUint aId ); - - - -private: - - /** - * By default Symbian OS constructor is private. - */ - void ConstructL(); - -private: // CActive - - /** - * @see CActive::RunL. - */ - void RunL(); - - /** - * @see CActive::DoCancel. - */ - void DoCancel(); - -private: // from MPhoneAudioPlayerObserver - /** - * Handle the error of audio file player. - */ - virtual void HandleAudioPlayerError( - TPhoneAudioPlayerErrorEvent aEvent, - TInt aError, - TInt aId = KPhoneAudioPlayerNotSpecified ); - - /** - * Handle audio player initialize complete. - */ - virtual void HandleAudioPlayerInitComplete( - TInt aId = KPhoneAudioPlayerNotSpecified ); - - /** - * Handle auido file playing complete successfully. - */ - virtual void HandlePlayingComplete( - TInt aId = KPhoneAudioPlayerNotSpecified ); - -private: - - /** - * @see MPhoneTimer - */ - virtual void HandleTimeOutL(); - -private: - - - // Indicate which tone is playing or need to be played: - // EIdle - idle, - // EAudioTonePlaying - audio playing, - // EBeepOnce - beep once playing, - // ESilentTonePlaying - silent tone playing, - // EDefaultTonePlaying - default tone playing, - // EBackupTonePlaying - backup tone playing, - // EVideoTonePlaying - playing video ringing tone - // ESilentVideoTonePlaying - silent playing video ringing tone - // EPersonalVideoTonePlaying - personal playing video ringing tone - enum TTonePlayingStatus - { - EIdle, - EAudioTonePlaying, - EBeepOnce, - ESilentTonePlaying, - EDefaultTonePlaying, - EBackupTonePlaying, - EVideoTonePlaying, - ESilentVideoTonePlaying, - EPersonalVideoTonePlaying - }; - - // States for this active object - enum TState - { - EIdleState, - EDeletingAudioPlayer, - EDeletingVideoPlayer, - EPlayingDefaultVideo - }; - - /** - * Deletes player asynchronoysly. - * @param aPlayer player to be deleted. - */ - void DeletePlayerAsync( - TPlayerId aPlayer ); - - /** - * Construct sequence players. - * @param aPlayer player to be constructed. - */ - void ConstructSequencePlayer( - TPlayerId aPlayer ); - - /** - * Construct sequence players. - * @param aPlayer player to be constructed. - */ - void ConstructSequencePlayerL( - TPlayerId aPlayer ); - - /** - * Construct backup tone player. - */ - TInt ConstructBackupPlayer(); - - - /** - * Construct media server and backup tone player. - */ - void ConstructBackupPlayerL(); - - /** - * Default ringingtone from profile engine. - */ - void ConstructDefaultPlayerL(); - - /** - * Do construct tone. - * @param aRingingTone Ringing tone. - * @return The instance of the player. NULL is returned if it's failed. - */ - CPhoneAudioPlayer* ConstructTonePlayer( - const CPhoneRingingTone& aRingingTone, - TInt aId ); - - /** - * Convert ringing type from PhoneAppEnging to the ringing type in - * CPhoneAudioPlayer. - * @param aRingingType the ringing type form PhoneAppEngine. - * @return ringing type of CPhoneAudioPlayer. - */ - CPhoneAudioPlayer::TRingingType ConvertRingingType( - TProfileRingingType aRingingType ); - - /** - * Convert ringing type from PhoneAppEnging to the ringing type in - * MPhoneVideoPlayer. - * @since Series 60 3.1 - * @param aRingingType the ringing type form PhoneAppEngine. - * @return ringing type of MPhoneVideoPlayer. - */ - MPhoneVideoPlayer::TPlayMode ConvertVideoRingingType( - TProfileRingingType aRingingType ); - - /** - * Cleanup players. - */ - void CleanupPlayers(); - - /** - * Handle audio player error. - * @param aDelete ETrue if deletion of the player allowed, - * EFalse otherwise. - * @param aSync ETrue if synchronous deletion of players is allowed, - * EFalse otherwise. - */ - void DoHandlePlayerError( - TBool aDelete, - TBool aSync ); - - -private: // Data - - - // State of this active object - TState iState; - - // Player to be deleted asynchronously. - RPointerArray iAsyncDeletePlayers; - - // Current playing status. - TTonePlayingStatus iTonePlayingStatus; - - // Voice call ringing tone file size max value. - TInt iToneFileSizeLimitKB; - - // DRM extend security - TBool iExtSecNeeded; - - // Volume for backup tone playing. - TInt iVolume; - - // Ringing type for backup tone playing. - TProfileRingingType iRingingType; - - // Audio ring tone player. Memory allocated during construction. - // After constructed, no leave may be caused during audio playing - CPhoneAudioPlayer* iAudioPlayer; - - // Audio player for beep once. - CPhoneAudioPlayer* iBeepOncePlayer; - - // Audio player for silent tone. - CPhoneAudioPlayer* iSilentPlayer; - - // Default player. - CPhoneAudioPlayer* iDefaultPlayer; - - // Tts player. - CPhoneAudioPlayer* iTtsPlayer; - - // Backup ringing tone. Incase all default player failed. - CPhoneAudioPlayer* iBackupPlayer; - - // Default player - CPhoneRingingTone* iDefaultRingingTone; - - // Media server. - CMdaServer* iMdaServer; - - // Timer. - CPhoneTimer* iTimer; - - // Audio/Video tone - CPhoneRingingTone* iAudioVideoRingingTone; - }; - -#endif /* CPHONERINGINGTONEPLAYER_H_ */ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphonetoneserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/inc/cphonetoneserver.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,103 @@ +/* +* Copyright (c) 2010-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: Phone ringing tone server definitions. +* +*/ + + +#ifndef PHONETONESERVER_H +#define PHONETONESERVER_H + +// INCLUDES +#include +#include +#include + +#include "mphonetoneserver.h" + +// CONSTANTS +const TInt KRingingToneSrvVersionMajor = 1; +const TInt KRingingToneSrvVersionMinor = 0; +const TInt KRingingToneSrvVersionBuild = 0; +_LIT( KRingingToneServerName, "PhoneRingingToneSrv" ); + +enum TRingingToneSrvOpcodes + { + EPlayAudioRingTone, + EStopPlaying + }; + +// CLASS DECLARATION +NONSHARABLE_CLASS( CPhoneToneServer ) : public CServer2, public MPhoneToneServer + { +public: + + static CPhoneToneServer* NewLC(); + + ~CPhoneToneServer(); + + + /** + * Thread entry function. + * + * @param aPtr + * @return new instance. + */ + + static TInt ThreadEntryFunc( TAny* aPtr ); + +public: + + /** + * Derived from CServer2, creates a new session. + * @param aVersion It is the version of the client api. + * @param aMessage Connect message from Client. + * @see CServer2 + * @return Returns a new session. + */ + CSession2* NewSessionL( const TVersion& aVersion, + const RMessage2& aMessage ) const; + + /** + * Runs server down. + * @see MPhoneToneServer + */ + virtual void RunDown() const; + +private: + + CPhoneToneServer(); + + void ConstructL(); + +private: + + /** + * Runs server. + */ + static void RunServerL(); + +private: + + /* + * Server should be unique connectable to avoid IPC fuzzing. + * However, NewSessionL is a const function, + * so we have to use mutable flag to define connection existence. + */ + mutable TBool iHasConnection; +}; + +#endif // PHONETONESERVER_H + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphonetoneserverplaybackcontroller.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/inc/cphonetoneserverplaybackcontroller.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,161 @@ +/* +* Copyright (c) 2010-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: Playback controller class for phone ringingtone server. +* +*/ + +#ifndef CPHONETONESERVERPLAYBACKCONTROLLER_H +#define CPHONETONESERVERPLAYBACKCONTROLLER_H + +#include +#include +#include + + +class MPhoneToneServer; + + +NONSHARABLE_CLASS( CPhoneToneServerPlaybackController ) : public CTimer, + private MMdaAudioPlayerCallback, + private MMdaAudioToneObserver + { + +public: + + static CPhoneToneServerPlaybackController* NewL(); + + ~CPhoneToneServerPlaybackController(); + + /** + * Plays tone set by control panel. + * + * @param aName file path of ringingtone + * @param aVolume volume of ringingtone + * @param aType type of ringtone e.g. ringing or silent + */ + void PlayNormalToneL( const TFileName& aName, + TInt aVolume, + TProfileRingingType aType ); + + /** + * Plays silent tone. + */ + void PlaySilentTone(); + + /** + * Stops playing. + */ + void StopTone(); + +private: + + /** + * Plays profile based tone. + * + */ + void PlayProfileTone(); + + /** + * Plays default tone + * + */ + void PlayDefaultTone(); + + /** + * Converts volume level + * + * @param aMaxVolume player's maximum volume + * @param aVolume requested volume level. + */ + TInt ConvertVolume( TInt aMaxVolume, TInt aVolume ); + + /** + * Stops and deletes last used player. + * + */ + void StopAndDeleteProfilePlayer(); + + + /** + * Checks that file uses rng file type + * + * @param aFile ringingtone file name + * @return TBool true when file uses rng file type. + */ + TBool IsRngL( const TDesC& aFile ); + +private: + + CPhoneToneServerPlaybackController(); + + void ConstructL(); + +private: + + /** + * @see MMdaAudioPlayerCallback + */ + void MapcInitComplete( + TInt aError, + const TTimeIntervalMicroSeconds& aDuration ); + + /** + * @see MMdaAudioPlayerCallback + */ + void MapcPlayComplete( TInt aError ); + + /** + * @see MMdaAudioToneObserver + */ + void MatoPrepareComplete(TInt aError ); + + /** + * @see MMdaAudioToneObserver + */ + void MatoPlayComplete(TInt aError); + + +private: + + /** + * @see CActive + */ + virtual void RunL(); + + +private: + + // Owned + CMdaAudioPlayerUtility* iDefaultPlayer; + + // Owned + CMdaAudioPlayerUtility* iProfileSamplePlayer; + + // Owned + CMdaAudioToneUtility* iProfileTonePlayer; + + // Owned + CMdaAudioToneUtility* iSilentPlayer; + + TProfileRingingType iRingingType; + + TBool iDefaultPlayerInitialized; + + TInt iVolume; + + }; + +#endif // CPHONETONESERVERPLAYBACKCONTROLLER_H + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphonetoneserversession.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/inc/cphonetoneserversession.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,70 @@ +/* +* Copyright (c) 2010-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: Session class for phone ringingtone server. +* +*/ + +#ifndef CPHONETONESERVERSESSION_H +#define CPHONETONESERVERSESSION_H + +#include + +class MPhoneToneServer; +class CPhoneToneServerPlaybackController; + +NONSHARABLE_CLASS( CPhoneToneServerSession ) : public CSession2 + { +public: + + /** + * Two-phased constructor. + * + * @param aServer Interface for server. + * @return new instance. + */ + static CPhoneToneServerSession* NewL( const MPhoneToneServer& aServer ); + + ~CPhoneToneServerSession(); + +protected: + + /** + * From CSession2, it is called whenever request is processed. + * @param aMessage It is the request. + */ + void ServiceL( const RMessage2& aMessage ); + +private: + + /** + * C++ default constructor. + * + * @param aServer Reference to server interface + */ + CPhoneToneServerSession( const MPhoneToneServer& aServer ); + + void ConstructL(); + + +private: + + const MPhoneToneServer& iServer; + + //Owned. + CPhoneToneServerPlaybackController* iController; + }; + +#endif //CPHONETONESERVERSESSION_H + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/cphonettsplayer.h --- a/phoneapp/phoneringingtoneplayer/inc/cphonettsplayer.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,200 +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 CPHONETTSPLAYER_H_ -#define CPHONETTSPLAYER_H_ - -// System includes -#include -#include - -// User includes -#include "cphonetimer.h" -#include "cphoneaudioplayer.h" -#include "mphoneaudioplayerobserver.h" - -// Forward declarations -class CPhoneRingingTone; -class CPhoneRingingtonePlayer; - -NONSHARABLE_CLASS(CPhoneTTSPlayer): public CBase, - public MPhoneAudioPlayerObserver - - { -public: - CPhoneTTSPlayer(CPhoneRingingtonePlayer* aRingingtonePlayer); - virtual ~CPhoneTTSPlayer(); - - /** - * Two-phased constructor. - * @return new instance. - */ - static CPhoneTTSPlayer* NewL(CPhoneRingingtonePlayer* aRingingtonePlayer); - - -public: - - /** - * Play TTS tone simultaneously with Personal or Default tones. - * This method does not command phone to play TTS immediately. Instead - * it registers a request to play TTS, when Personal or default tones - * are played. - * - * @since Series 60 3.0 - * @param aTextToSay Text, that should be pronounced by the - * Text-To-Speech engine. This is normal descriptor, no UTF-8 - * and no "(tts)" prefix - */ - void PlayTtsTone( - const TDesC& aTextToSay, - CPhoneRingingTone* aAudioVideoRingingTone ); - - void StopPlaying(); - - - /** - * Checks if TTS component should be played for the current ringtone - * playback and initializes the TTS playback. This method is to be - * called from within PlayXXXXTone methods - * @since Series 60 3.0 - * @param aRingingType ringing type - */ - void AddTtsPlaybackIfNeeded(); - - -private: // from MPhoneAudioPlayerObserver - /** - * Handle the error of audio file player. - */ - virtual void HandleAudioPlayerError( - TPhoneAudioPlayerErrorEvent aEvent, - TInt aError, - TInt aId = KPhoneAudioPlayerNotSpecified ); - - /** - * Handle audio player initialize complete. - */ - virtual void HandleAudioPlayerInitComplete( - TInt aId = KPhoneAudioPlayerNotSpecified ); - - /** - * Handle auido file playing complete successfully. - */ - virtual void HandlePlayingComplete( - TInt aId = KPhoneAudioPlayerNotSpecified ); - -private: - - /** - * Enumerates how many times TTs is played - * ESaidOnce -once - * ESaidTwice twice - */ - enum TTtsStatus - { - ESaidOnce, - ESaidTwice - }; - - /** - * Wrapper of DoHandleTtsDelayTimeout, that can be used as TCallback. - * Immediately passes control to DoHandleTtsDelayTimeout method. - * @since Series 60 3.0 - * @param object Object to call DoHandleTtsDelayTimeout() on, . - * instance of CPhoneRingingTonePlayer. - * @return KErrNone. - */ - static TInt HandleTtsDelayTimeout( TAny* object ); - - /** - * It is called after TTS delay elapsed. Starts playing TTS. - */ - void DoHandleTtsDelayTimeout(); - - /** - * Returns currently active player which is used with TTS player. - * @return pointer to CPhoneAudioPlayer. - */ - CPhoneAudioPlayer* GetCurrentlyActiveAudioPlayerWithTTs(); - - /** - * TTs cases only. Calculates new volume and ramptimes - * for Ascending TTS ringing case and normal TTS ringing case. - * @param aStatus -status of TTs player. - */ - void SolveNewVolumeAndRamptime( TTtsStatus aStatus ); - - /** - * Retarts currently active ringingtone player. - */ - void ReStartRingingTonePlayer(); - - /** - * Convert ringing type from PhoneAppEnging to the ringing type in - * CPhoneAudioPlayer. - * @param aRingingType the ringing type form PhoneAppEngine. - * @return ringing type of CPhoneAudioPlayer. - */ - CPhoneAudioPlayer::TRingingType ConvertRingingType( - TProfileRingingType aRingingType ); - -private: - - /** - * By default Symbian OS constructor is private. - */ - void ConstructL(); - -private: - - // Tts player. - CPhoneAudioPlayer* iTtsPlayer; - - // True if Tts is currently playing. Is different from - // iTonePlayingStatus, because TTS is played in - // parallel with the other tone types - TBool iTtsTonePlaying; - - // Index of the TTS delay that is "executed" currently or is to be - // "executed" after the current playing of the TTS tone. Is zero based - TInt iTtsDelayIndex; - - // True if TTS tone should be played when the next playing of the - // default or personal tone is fired. - TBool iTtsToneToBePlayed; - - // Timer, that tracks delays before playing TTS - CPhoneTimer* iTtsDelayTimer; - - // Number of times TTS tone should be played for the CURRENT ringtone - // If ringing tone is to be played just once, iTtsDelayCount == 1, - // otherwise iTtsDelayCount == KTtsDelayCount - TInt iTtsDelaysCount; - - // Counter for TTs timeouts - TInt iTTsTimeOutCounter; - - // RingingType for TtsPlayer only. - TProfileRingingType iTtsRingingType; - - // Volume of the text pronounced by the TTS engine - TInt iTtsVolume; - - CPhoneRingingtonePlayer* iRingingtonePlayer; - }; - -#endif /* CPHONETTSPLAYER_H_ */ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/mphoneaudioplayerobserver.h --- a/phoneapp/phoneringingtoneplayer/inc/mphoneaudioplayerobserver.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +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 MPHONEAUDIOPLAYEROBSERVER_H -#define MPHONEAUDIOPLAYEROBSERVER_H - -// User includes -#include "phoneconstants.h" - -// Class declaration - -/** -* Observer interface for audio player. -* -* @since 1.0 -*/ -class MPhoneAudioPlayerObserver - { - public: // Constructors and destructor - - // Enumerates different failures. - // - // EAudioPlayerInitializingFailure - failure in initialising - // EAudioPlayerPlayingFailure - failure during playing - enum TPhoneAudioPlayerErrorEvent - { - EAudioPlayerInitializingFailure, - EAudioPlayerPlayingFailure - }; - - /** - * Observe the error. - * @param aEvent the error event happend in initializing or playing. - * @param aError The error code return by audio server. Observer can - * handle these two error code for recoverable - * and unrecoverable errors. - * @param aId Indicate which audio player is outof working. - */ - virtual void HandleAudioPlayerError( - TPhoneAudioPlayerErrorEvent aEvent, - TInt aError, - TInt aId = KPhoneAudioPlayerNotSpecified ) = 0; - - /** - * This function is called when audio player initialization complete. - * @param aId The id of the audio player. - */ - virtual void HandleAudioPlayerInitComplete( - TInt aId = KPhoneAudioPlayerNotSpecified ) = 0; - - /** - * This funciton is called after the playing complete successfully. - * @param aId The id of the audio player. - */ - virtual void HandlePlayingComplete( - TInt aId = KPhoneAudioPlayerNotSpecified ) = 0; - }; - -#endif // MPHONEAUDIOPLAYEROBSERVER_H - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/mphonecoveruiobserver.h --- a/phoneapp/phoneringingtoneplayer/inc/mphonecoveruiobserver.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +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 MPHONECOVERUIOBSERVER_H -#define MPHONECOVERUIOBSERVER_H - -// Class declaration - -/** -* Cover UI observer interface. -* -*/ -class MPhoneCoverUiObserver - { - public: - - /** - * This function is called when Mediator receives response to the sent - * ShowMultiMediaRingingTone command. - * @param aStatus - Standard Symbian error code indicating the - * success of the command. - */ - virtual void ShowMultimediaRingingToneResponseL( TInt aStatus ) = 0; - }; - -#endif // MPHONECOVERUIOBSERVER_H - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/mphoneringingtoneobserver.h --- a/phoneapp/phoneringingtoneplayer/inc/mphoneringingtoneobserver.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef MPHONERINGINGTONEOBSERVER_H -#define MPHONERINGINGTONEOBSERVER_H - -// INCLUDES -#include - -// CLASS DECLARATION - -/** -* Observer interface for ringing tone playing -* -* @since Series 60 3.1 -*/ -class MPhoneRingingToneObserver - { - public: - /** - * Observer the ringing tone playing - * @param aPlayingAudio ETrue is ringing tone audio is playing. - * @param aPlayingVideo ETrue is ringing tone video is playing. - */ - virtual void RingingTonePlaying( - TBool aPlayingAudio, - TBool aPlayingVideo ) = 0; - }; - -#endif // MPHONERINGINGTONEOBSERVER_H - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/mphonetoneserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/inc/mphonetoneserver.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,33 @@ +/* +* Copyright (c) 2010-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: Interface class for phone ringing tone server. +* +*/ + + +#ifndef MPHONETONESERVER_H +#define MPHONETONESERVER_H + +// CLASS DECLARATION +class MPhoneToneServer + { +public: + + virtual void RunDown() const = 0; + + }; + +#endif // MPHONETONESERVER_H + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/mphonevideoplayer.h --- a/phoneapp/phoneringingtoneplayer/inc/mphonevideoplayer.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +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 M_PHONEVIDEOPLAYER_H -#define M_PHONEVIDEOPLAYER_H - -// Forward declarations -class MPhoneVideoPlayerObserver; - -/** - * Abstract video playing interface. - * - * - * @lib Phone.exe - * @since S60 v3.2 - */ -class MPhoneVideoPlayer - { -public: - /** Play modes */ - enum TPlayMode - { - EPlayInLoop, - EPlayOnce, - EPlayAscending - }; - -public: - /** - * Plays given video ringing tone. - * - * @since S60 S60 v3.2 - * @param aFileName File name. - * @param aPlayMode Playing mode. - * @param aVolumeLevel Playing volume, range: 0-10. - * @param aArbitraryScaling Set ETrue if arbitrary scaling supported. - * @param aObserver Observer for playback events. - */ - virtual void PlayVideoRingTone( const TDesC& aFileName, - TPlayMode aPlayMode, - TInt aVolumeLevel, - TBool aArbitraryScaling, - MPhoneVideoPlayerObserver* aObserver ) = 0; - - /** - * Stops ringing. - * - * @since S60 S60 v3.2 - */ - virtual void StopVideoRingTone() = 0; - - /** - * Mutes ringing tone playing. - * - * @since S60 S60 v3.2 - */ - virtual void MuteVideoRingTone() = 0; - - /** - * Cancels ringing tone playing. - * - * @since S60 S60 v3.2 - */ - virtual void CancelVideoRingTone() = 0; - }; - - -#endif // M_PHONEVIDEOPLAYER_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/mphonevideoplayerobserver.h --- a/phoneapp/phoneringingtoneplayer/inc/mphonevideoplayerobserver.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +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 MPHONEVIDEOPLAYEROBSERVER_H -#define MPHONEVIDEOPLAYEROBSERVER_H - -// Class declaration - -/** -* Video player observer interface. -* -* @lib Phone.app -* @since Series 60 3.1 -*/ -class MPhoneVideoPlayerObserver - { - public: - - // Enumerates different failure events. - // - enum TPhoneVideoPlayerErrorEvent - { - EVideoPlayerInitializingFailure, // Failure during initialization - EVideoPlayerPlayingFailure // Failure during playback - }; - - /** - * This function is called for video player errors. - * @param aEvent The error event happend in initializing or playing. - * @param aError The error code return by MMF video player. - */ - virtual void HandleVideoPlayerError( - TPhoneVideoPlayerErrorEvent aEvent, - TInt aError ) = 0; - - /** - * This function is called when video player initialization complete - */ - virtual void HandleVideoPlayerInitComplete() = 0; - - /** - * This function is called after the playing completes successfully - */ - virtual void HandleVideoPlayerPlayingComplete() = 0; - }; - -#endif // MPHONEVIDEOPLAYEROBSERVER_H - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/phoneringingtonetrace.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/inc/phoneringingtonetrace.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,71 @@ +/* +* ============================================================================ +* Name : phoneringingtonetrace.h +* Part of : PhoneRingingtone +* Description : Macros for tracing. +* Version : +* +* Copyright © 2010 Nokia. All rights reserved. +* This material, including documentation and any related computer +* programs, is protected by copyright controlled by Nokia. All +* rights are reserved. Copying, including reproducing, storing, +* adapting or translating, any or all of this material requires the +* prior written consent of Nokia. This material also contains +* confidential information which may not be disclosed to others +* without the prior written consent of Nokia. +* ============================================================================ +* Template version: 4.1 +*/ + + +#ifndef PHONERINGINGTONETRACE_H +#define PHONERINGINGTONETRACE_H + + + + +// INCLUDES +#include + +#if ( defined (_DEBUG) && !defined (__WINS__) ) + +// CONSTANTS + +const TInt KPhoneRingingtoneDebugBufferSize = 300; + +// MACROS + +typedef TBuf TPhonePhoneRingingtoneDebBuf; + +#define PHONERINGINGTONE_PRINT(x) { _LIT( KPhoneRingingtoneDebugPrintPrefix, "PhoneRingingtone: ");\ + TPhonePhoneRingingtoneDebBuf buf( KPhoneRingingtoneDebugPrintPrefix);\ + if ((_L(x).Length()) + buf.Length() <= KPhoneRingingtoneDebugBufferSize )\ + buf.Append(_L(x)); RDebug::Print(buf); } + +#define PHONERINGINGTONE_PRINTF(x,y) { _LIT( KPhoneRingingtoneDebugPrintPrefix, "PhoneRingingtone: ");\ + TPhonePhoneRingingtoneDebBuf buf( KPhoneRingingtoneDebugPrintPrefix);\ + if ((_L(x).Length()) + buf.Length() <= KPhoneRingingtoneDebugBufferSize )\ + buf.Append(_L(x)); RDebug::Print(buf,y);} + +#define PHONERINGINGTONE_PRINTF2(x,y,z) { _LIT( KPhoneRingingtoneDebugPrintPrefix, "PhoneRingingtone: ");\ + TPhonePhoneRingingtoneDebBuf buf( KPhoneRingingtoneDebugPrintPrefix);\ + if ((_L(x).Length()) + buf.Length() <= KPhoneRingingtoneDebugBufferSize )\ + buf.Append(_L(x)); RDebug::Print(buf,y,z); } + +#define PHONERINGINGTONE_PRINTF3(v,x,y,z) { _LIT( KPhoneRingingtoneDebugPrintPrefix, "PhoneRingingtone: ");\ + TPhonePhoneRingingtoneDebBuf buf( KPhoneRingingtoneDebugPrintPrefix);\ + if ((_L(v).Length()) + buf.Length() <= KPhoneRingingtoneDebugBufferSize )\ + buf.Append(_L(v)); RDebug::Print(buf,x,y,z); } + +#else // !_DEBUG + +#define PHONERINGINGTONE_PRINT(x) +#define PHONERINGINGTONE_PRINTF(x,y) +#define PHONERINGINGTONE_PRINTF2(x,y,z) +#define PHONERINGINGTONE_PRINTF3(v,x,y,z) + +#endif // _DEBUG + +#endif // PHONERINGINGTONETRACE_H + +// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/inc/rphonetoneclient.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/inc/rphonetoneclient.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,61 @@ +/* +* Copyright (c) 2010-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: Client interface for phone ringing tone server. +* +*/ + + +#ifndef RPHONETONECLIENT_H +#define RPHONETONECLIENT_H + +// INCLUDES +#include + +// FORWARD DECLARATIONS +class TPhoneCommandParam; + +// CLASS DECLARATION + +class RPhoneToneClient : public RSessionBase + { +public: + + IMPORT_C RPhoneToneClient(); + + IMPORT_C ~RPhoneToneClient(); + + /** + * Starts playing the ringing tone. + * Method plays tone according to values of parameter + * @param aCommandParam contais ringingtone file name, volume etc. + */ + IMPORT_C void PlayRingingToneL( TPhoneCommandParam *aCommandParam ); + + /** + * Stops playing the ringing tone. + * Method does not do anything if ringing tone is not playing. + */ + IMPORT_C void StopPlayingL(); + + /** + * Establishes a connection with Server. + * @return Result code indicating the success of operation. + */ + IMPORT_C TInt Connect(); + + }; + +#endif // RPHONETONECLIENT_H + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphoneaudioplayer.cpp --- a/phoneapp/phoneringingtoneplayer/src/cphoneaudioplayer.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1063 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -// INCLUDE FILES -#include -#include -#include -#include -#include -#include // for converting data for tts -#include -#include - -#include "cphoneaudioplayer.h" -#include "cphoneringingtone.h" -#include "mphoneaudioplayerobserver.h" -#include "phoneconstants.h" -#include "phonelogger.h" -#include "phoneui.pan" - - -// CONSTANTS - - -_LIT( KFileListRngMimeType, "application/vnd.nokia.ringing-tone" ); -//Min volume level -const TInt KMinVolumeLevel = 1; -//Max volume level -const TInt KMaxVolumeLevel = 10; -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::CPhoneAudioPlayer -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer::CPhoneAudioPlayer( TAudioDataFormat aDataFormat, - MPhoneAudioPlayerObserver& aObserver, - TInt aPriority, - TUint aPreference, - TInt aId ) - : iFormat( aDataFormat ), - iObserver( aObserver ), - iPriority( aPriority ), - iPreference( aPreference ), - iId( aId ) - { - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::ConstructL -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::ConstructL( - const TDesC& aFileName, - CMdaServer* aMdaServer ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::ConstructL()" ); - if ( iFormat == EFormatTone ) - { - iTonePlayer = CMdaAudioToneUtility::NewL( *this, aMdaServer ); - iTonePlayer->PrepareToPlayFileSequence( aFileName ); - iPlayerStatus = EToneLoading; - } - else - { - //audio sample player - __PHONELOG3( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::ConstructL - aFileName(%S), iPriority(%d), iPreference(%d)", - &aFileName, - iPriority, - iPreference ); - - iSamplePlayer = CMdaAudioPlayerUtility::NewFilePlayerL( - aFileName, - *this, - iPriority, - static_cast< TMdaPriorityPreference >( iPreference ), - aMdaServer ); - iPlayerStatus = EToneLoading; - - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::ConstructSeqL -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::ConstructSeqL( - const TDesC8& aSequence, - CMdaServer* aMdaServer ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::ConstructSeqL()" ); - iTonePlayer = CMdaAudioToneUtility::NewL( *this, aMdaServer ); - iSequence = aSequence.AllocL(); - iTonePlayer->PrepareToPlayDesSequence( *iSequence ); - iPlayerStatus = EToneLoading; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::ConstructTtsL -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::ConstructTtsL( - const TDesC& aTtsText, - TInt aPriority, - TUint aPreference ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::ConstructTtsL()" ); - delete iTtsPlayer; // if any - iTtsPlayer = NULL; - iTtsPlayer = - CMdaAudioPlayerUtility::NewL( - *this, aPriority, - static_cast< TMdaPriorityPreference >( aPreference ) ); - - delete iTtsText; // if any - iTtsText = NULL; - // UTF-8 strings can take up to 4 bytes per character - iTtsText = HBufC8::NewL( aTtsText.Length() << KTimesToMultiply ); - - TPtr8 refText = iTtsText->Des(); - User::LeaveIfError( - CnvUtfConverter::ConvertFromUnicodeToUtf8( refText, aTtsText ) ); - - // UTF-8 chars can be up to 4 bytes long, but usually - // take 1-2 bytes, 3 for asian chars. - HBufC8* oldText = iTtsText; - iTtsText = iTtsText->ReAlloc( iTtsText->Length() ); - if ( !iTtsText ) - { - // ReAlloc failed, set back to original. - iTtsText = oldText; - } - - iTtsPlayer->OpenDesL( *iTtsText ); - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::New -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* CPhoneAudioPlayer::New( - const CPhoneRingingTone& aRingingTone, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId, - CMdaServer* aMdaServer, - TBool aExtSecNeeded ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::New()" ); - CPhoneAudioPlayer* self = NULL; - TRAPD( err, self = CPhoneAudioPlayer::NewL( - aRingingTone, - aPriority, - aPreference, - aObserver, - aId, - aMdaServer, - aExtSecNeeded ) ); - if ( err != KErrNone ) - { - return NULL; - } - return self; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::NewL -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* CPhoneAudioPlayer::NewL( - const CPhoneRingingTone& aRingingTone, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId, - CMdaServer* aMdaServer, - TBool aExtSecNeeded ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::NewL()" ); - __PHONELOG1( EBasic, EPhoneControl, "CPhoneAudioPlayer::NewL - aExtSecNeeded(%d)", - aExtSecNeeded ); - - // Check the file DRM property if extend secure is needed. - if ( aExtSecNeeded ) - { - if ( !aRingingTone.IsFileInRom() && - !aRingingTone.IsFileDrmProtected() ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneAudioPlayer::NewL - DRM extend security check permission denied" ); - User::Leave( KErrPermissionDenied ); - } - __PHONELOG( EBasic, EPhoneControl, "CPhoneAudioPlayer::NewL - DRM extend security check ok" ); - } - // RNG file types have to be played with CMdaAudioToneUtility player. - // Otherwise use sample player - TAudioDataFormat format = - ( aRingingTone.MimeType().CompareF( KFileListRngMimeType ) == KErrNone ) - ? EFormatTone :EFormatSample; - - CPhoneAudioPlayer* self = - new (ELeave) CPhoneAudioPlayer( - format, - aObserver, - aPriority, - aPreference, - aId ); - - CleanupStack::PushL( self ); - self->ConstructL( aRingingTone.FileName(), aMdaServer ); - CleanupStack::Pop( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::NewL -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* CPhoneAudioPlayer::NewL( - const TDesC& aFileName, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId, - CMdaServer* aMdaServer, - TBool aExtSecNeeded ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::NewL()" ); - CPhoneRingingTone* tone = CPhoneRingingTone::NewL( aFileName ); - CleanupStack::PushL( tone ); - - CPhoneAudioPlayer* player = CPhoneAudioPlayer::NewL( *tone, - aPriority, - aPreference, - aObserver, - aId, - aMdaServer, - aExtSecNeeded ); - - CleanupStack::PopAndDestroy( tone ); - - return player; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::NewSeqL -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* CPhoneAudioPlayer::NewSeqL( - const TDesC8& aSequence, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId, - CMdaServer* aMdaServer ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::NewSeqL()" ); - CPhoneAudioPlayer* self = - new (ELeave) CPhoneAudioPlayer( - EFormatTone, - aObserver, - aPriority, - aPreference, - aId ); - - CleanupStack::PushL( self ); - self->ConstructSeqL( aSequence, aMdaServer ); - CleanupStack::Pop( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::NewTtsL -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* CPhoneAudioPlayer::NewTtsL( - const TDesC& aText, - TInt aPriority, - TUint aPreference, - MPhoneAudioPlayerObserver& aObserver, - TInt aId ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::NewTtsL()" ); - CPhoneAudioPlayer* self = - new (ELeave) CPhoneAudioPlayer( - EFormatTts, - aObserver, - aPriority, - aPreference, - aId ); - - CleanupStack::PushL( self ); - self->ConstructTtsL( aText, aPriority, aPreference ); - CleanupStack::Pop( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::~CPhoneAudioPlayer -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer::~CPhoneAudioPlayer() - { - - if ( iAudioOutput ) - { - delete iAudioOutput; - } - if ( iTonePlayer ) - { - delete iTonePlayer; - } - if ( i3DPlugin ) - { - i3DPlugin->Stop(); - delete i3DPlugin; - } - // ECom cleanup - REComSession::FinalClose(); - if ( iSamplePlayer ) - { - delete iSamplePlayer; - } - if ( iTtsPlayer ) - { - delete iTtsPlayer; - } - if ( iSequence ) - { - delete iSequence; - } - if ( iTtsText ) - { - delete iTtsText; - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::Play -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::Play( TRingingType aRingType, TInt aVolume, TInt aTTsToBePlayed ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::Play()" ); - __PHONELOG2( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::Play - iFormat(%d), iPlayerStatus(%d)", - iFormat, - iPlayerStatus ); - __PHONELOG3( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::Play - aRingType(%d), aVolume(%d), aTTsToBePlayed(%d)", - aRingType, - aVolume, - aTTsToBePlayed ); - iRingType = aRingType; - iVolume = aVolume; - iTTsToBePlayed = aTTsToBePlayed; - - if ( iFormat == EFormatTone ) - { - switch ( iPlayerStatus ) - { - case ETonePlaying: - iTonePlayer->CancelPlay(); - DoPlay(); - break; - - case EToneReady: - iPlayerStatus = ETonePlaying; - DoPlay(); - break; - - case EToneLoading: - iToBePlaying = ETrue; - break; - - default: - __ASSERT_DEBUG( EFalse, - - Panic( EPhoneViewCaseNotHandled ) ); - } - } - else if ( iFormat == EFormatTts ) - { - switch ( iPlayerStatus ) - { - case ETonePlaying: - //stop previous playing - iTtsPlayer->Stop(); - DoPlay(); - break; - - case EToneReady: - iPlayerStatus = ETonePlaying; - DoPlay(); - break; - - case EToneLoading: - iToBePlaying = ETrue; - break; - - default: - __ASSERT_DEBUG( EFalse, - Panic( EPhoneViewCaseNotHandled ) ); - } - } - else - { - switch ( iPlayerStatus ) - { - case ETonePlaying: - //stop previous playing - StopPlaying(); - iPlayerStatus = ETonePlaying; - DoPlay(); - break; - - case EToneReady: - iPlayerStatus = ETonePlaying; - DoPlay(); - break; - - case EToneLoading: - iToBePlaying = ETrue; - break; - - default: - __ASSERT_DEBUG( EFalse, - - Panic( EPhoneViewCaseNotHandled ) ); - } - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::ReStartPlaying -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::ReStartPlaying() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::ReStartPlaying()" ); - __PHONELOG3( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::ReStartPlaying - iFormat(%d), iRingType(%d), iVolume(%d)", - iFormat, - iRingType, - iVolume ); - - if ( iFormat == EFormatTone ) - { - iTonePlayer->Play(); - iPlayerStatus = ETonePlaying; - } - else if ( iFormat == EFormatTts ) - { - iTtsPlayer->Play(); - iPlayerStatus = ETonePlaying; - } - else - { - iSamplePlayer->Play(); - iPlayerStatus = ETonePlaying; - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::StopPlaying -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::StopPlaying() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::StopPlaying()" ); - iToBePlaying = EFalse; - - if ( iFormat == EFormatTone ) - { - if ( EMdaAudioToneUtilityPrepared == iTonePlayer->State() ) - { - iTonePlayer->CancelPrepare(); - } - else if ( EMdaAudioToneUtilityPlaying == iTonePlayer->State() ) - { - iTonePlayer->CancelPlay(); - } - } - else if ( iFormat == EFormatTts ) - { - iTtsPlayer->Stop(); - } - else - { - if ( i3DPlugin ) - { - i3DPlugin->Stop(); - delete i3DPlugin; - i3DPlugin = NULL; - } - else - { - iSamplePlayer->Stop(); - } - } - - iPlayerStatus = EToneReady; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::MapcInitComplete -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::MapcInitComplete( - TInt aError, - const TTimeIntervalMicroSeconds& /*aDuration*/ ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::MapcInitComplete()" ); - __PHONELOG1( EBasic, EPhoneControl, "CPhoneAudioPlayer::MapcInitComplete - aError(%d)", - aError ); - __ASSERT_DEBUG( ( ( iFormat == EFormatSample ) || ( iFormat == EFormatTts ) ) && - ( iPlayerStatus == EToneLoading ), Panic( EPhoneViewGeneralError ) ); - if ( aError == KErrNone ) - { - if ( iToBePlaying ) - { - iPlayerStatus = ETonePlaying; - iToBePlaying = EFalse; - DoPlay(); - } - else - { - iPlayerStatus = EToneReady; - } - iObserver.HandleAudioPlayerInitComplete( iId ); - } - else - { - iObserver.HandleAudioPlayerError( - MPhoneAudioPlayerObserver::EAudioPlayerInitializingFailure, - aError, iId ); - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::MapcPlayComplete -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::MapcPlayComplete( TInt aError ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::MapcPlayComplete()" ); - __PHONELOG2( EBasic, EPhoneControl, "CPhoneAudioPlayer::MapcPlayComplete - iFormat(%d), aError(%d)", - iFormat, aError ); - iPlayerStatus = EToneReady; - - //Destruct 3D plugin before player itself gets destructed. - //In case of continuous ringing type, stopplaying() handles - //3d plugin destruction - if ( i3DPlugin ) - { - i3DPlugin->Stop(); - delete i3DPlugin; - i3DPlugin = NULL; - } - - if ( aError != KErrNone ) - { - iObserver.HandleAudioPlayerError( - MPhoneAudioPlayerObserver::EAudioPlayerPlayingFailure, - aError, iId ); - } - else - { - iObserver.HandlePlayingComplete( iId ); - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::MatoPrepareComplete -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::MatoPrepareComplete( TInt aError ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::MatoPrepareComplete()" ); - __PHONELOG1( EBasic, EPhoneControl, "CPhoneAudioPlayer::MatoPrepareComplete - aError(%d)", - aError ); - - __ASSERT_DEBUG( ( iFormat == EFormatTone ) && ( iPlayerStatus == EToneLoading ), - Panic( EPhoneViewGeneralError ) ); - if ( aError == KErrNone ) - { - if ( iToBePlaying ) - { - iPlayerStatus = ETonePlaying; - iToBePlaying = EFalse; - DoPlay(); - } - else - { - iPlayerStatus = EToneReady; - } - iObserver.HandleAudioPlayerInitComplete( iId ); - } - else - { - iObserver.HandleAudioPlayerError( - MPhoneAudioPlayerObserver::EAudioPlayerInitializingFailure, - aError, iId ); - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::MatoPlayComplete -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::MatoPlayComplete(TInt aError) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::MatoPlayComplete()" ); - __PHONELOG1( EBasic, EPhoneControl, "CPhoneAudioPlayer::MatoPlayComplete - aError(%d)", - aError ); - if ( aError != KErrNone ) - { - iObserver.HandleAudioPlayerError( - MPhoneAudioPlayerObserver::EAudioPlayerPlayingFailure, - aError, iId ); - } - else - { - iObserver.HandlePlayingComplete( iId ); - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::DoPlay -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::DoPlay() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::DoPlay()" ); - __ASSERT_DEBUG( iPlayerStatus == ETonePlaying, - Panic( EPhoneViewGeneralError ) ); - - SetRingingTypeProperties(); - - TInt err(KErrNone); - if ( iFormat == EFormatTone ) - { - iTonePlayer->Play(); - } - else if ( iFormat == EFormatTts ) - { - iTtsPlayer->Play(); - } - else - { - TRAP( err,i3DPlugin = C3DRingingToneInterface::NewL( KNullUid ) ); - if ( !err && i3DPlugin ) - { - i3DPlugin->SetAttr( E3DRTIAttrAudioPlayerUtility, iSamplePlayer ); - TRAP( err,i3DPlugin->PlayL() ) - } - if ( err || !i3DPlugin ) - { - if ( !iAudioOutput ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneAudioPlayer::DoPlay c aud "); - TRAP (err, iAudioOutput = CAudioOutput::NewL( *iSamplePlayer ) ); - if ( err ) - { - __PHONELOG1(EBasic, EPhoneControl, - "P.AudPlayer.DoPlay.iAudioOutput.err ", err ); - } - } - if ( !err && iAudioOutput ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneAudioPlayer::DoPlay EALL "); - TRAP (err, iAudioOutput->SetAudioOutputL( CAudioOutput::EAll ) ); - if ( err ) - { - __PHONELOG1( EBasic, EPhoneControl, - "P.AudPlayer.DoPlay.SetAudioOutputL.err ", err ); - } - - } - iSamplePlayer->Play(); - } - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::SetRingingTypeProperties -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::SetRingingTypeProperties() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::SetRingingTypeProperties()" ); - __PHONELOG2( EBasic, EPhoneControl, "CPhoneAudioPlayer::SetRingingTypeProperties - iFormat(%d), iRingType(%d)", - iFormat, iRingType ); - TInt rampTime( 0 ); - if ( iFormat == EFormatTone ) - { - switch ( iRingType ) - { - case ETypeRinging: - //If we have TTS activated and ringingtype is ringing: - //We need to play TTS sequence again when ringingtone restarts. - //Thats why we need to set ringingtype to ETypeRingingOnce because - //it is the only way of knowing when ringingtone is completed. - //Then we can restart it with new TTS iterations. - if ( iTTsToBePlayed ) - { - //play only once - iTonePlayer->SetRepeats( 0, - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - iTonePlayer->SetVolume( ConvertVolume( iVolume ) ); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing tone with TTS, Set volume(%d) and ring once", - iVolume ); - } - else - { - iTonePlayer->SetRepeats( KPhoneMdaAudioToneRepeatForever, - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - iTonePlayer->SetVolume( ConvertVolume( iVolume ) ); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing tone, Set volume(%d)", - iVolume ); - } - break; - - case ETypeRingingOnce: - //play only once - iTonePlayer->SetRepeats( 0, - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - iTonePlayer->SetVolume( ConvertVolume( iVolume ) ); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ring once tone, set volume(%d)", - iVolume ); - break; - - case ETypeAscending: - iTonePlayer->SetRepeats( KPhoneMdaAudioToneRepeatForever, - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - - //Special case for TTs + ascending profile. Volume - //and ramptime needs to be different as usual - if ( iTTsToBePlayed ) - { - //rampTime in this case is only 3 seconds and volume is 1. - rampTime = KPhoneAudioAscendingRampDuration; - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending tone with TTS, Start from lowest volume, rampTime(%d)", - rampTime ); - iTonePlayer->SetVolumeRamp( - TTimeIntervalMicroSeconds( rampTime ) ); - - iCurrentVolume = 1; //we start from the lowest volume - iTonePlayer->SetVolume( ConvertVolume( iCurrentVolume ) ); - } - else - { - //rampTime: time for one step * volume level - rampTime = KPhoneAudioAscendingRampDuration*iVolume; - __PHONELOG2( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending tone, Set volume(%d), rampTime(%d)", - iVolume, rampTime ); - iTonePlayer->SetVolumeRamp( - TTimeIntervalMicroSeconds( rampTime ) ); - - iCurrentVolume = 1; //we start from the lowest volume - iTonePlayer->SetVolume( ConvertVolume( iVolume ) ); - } - break; - - default: - Panic( EPhoneViewGeneralError ); - break; - } - - __PHONELOG3( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Tone, iPriority(%d), iPreference(%d), iVolume(%d)", - iPriority, iPreference, iVolume ); - - //Set priority and preference - iTonePlayer->SetPriority( iPriority, - static_cast< TMdaPriorityPreference >( iPreference ) ); - } - else if ( iFormat == EFormatTts ) - { - switch ( iRingType ) - { - case ETypeRinging: - case ETypeAscending: - // Not possible iRingType for TTS. - break; - - case ETypeRingingOnce: - iTtsPlayer->SetRepeats( 0, // play only once - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - iTtsPlayer->SetVolume( ConvertVolume( iVolume ) ); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - TTS, Set volume(%d)", - iVolume ); - break; - - default: - __ASSERT_DEBUG( EFalse, - Panic( EPhoneViewCaseNotHandled ) ); - } - __PHONELOG( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - TTS" ); - } - else - { - switch ( iRingType ) - { - case ETypeRinging: - //If we have TTS activated and ringingtype is ringing: - //We need to play TTS sequence again when ringingtone restarts. - //Thats why we need to set ringingtype to ETypeRingingOnce because - //it is theonly way of knowing when ringingtone is completed. - //Then we can restartit with new TTS iterations. - if ( iTTsToBePlayed ) - { - //play only once - iSamplePlayer->SetRepeats( 0, - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - iSamplePlayer->SetVolume( ConvertVolume( iVolume ) ); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing sample with TTS, Ring only once, Set volume(%d)", - iVolume ); - } - else - { - iSamplePlayer->SetRepeats( KPhoneMdaAudioToneRepeatForever, - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - iSamplePlayer->SetVolume( ConvertVolume( iVolume ) ); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing sample, Set volume(%d)", - iVolume ); - } - break; - - case ETypeRingingOnce: - iSamplePlayer->SetRepeats( 0,//play only once - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - iSamplePlayer->SetVolume( ConvertVolume( iVolume ) ); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ring once sample, set volume(%d)", - iVolume ); - break; - - case ETypeAscending: - iSamplePlayer->SetRepeats( KPhoneMdaAudioToneRepeatForever, - TTimeIntervalMicroSeconds( - KPhoneRingingRepeatsTrailPause ) ); - - //Special case for TTs + ascending profile. Volume - //and ramptime needs to be different as usual - if ( iTTsToBePlayed ) - { - //rampTime in this case is only 3 seconds and volume is 1. - rampTime = KPhoneAudioAscendingRampDuration; - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending sample with TTS, Start from lowest volume, rampTime(%d)", - rampTime ); - iSamplePlayer->SetVolumeRamp( - TTimeIntervalMicroSeconds( rampTime ) ); - - iCurrentVolume = 1; //we start from the lowest volume - iSamplePlayer->SetVolume( ConvertVolume( iCurrentVolume ) ); - } - else - { - //rampTime: time for one step * volume level - rampTime = KPhoneAudioAscendingRampDuration*iVolume; - __PHONELOG2( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending sample, Set volume(%d), rampTime(%d)", - iVolume, rampTime ); - iSamplePlayer->SetVolumeRamp( - TTimeIntervalMicroSeconds( rampTime ) ); - - iCurrentVolume = 1; //we start from the lowest volume - iSamplePlayer->SetVolume( ConvertVolume( iVolume ) ); - } - break; - - default: - Panic( EPhoneViewGeneralError ); - break; - } - - __PHONELOG( - EBasic, - EPhoneControl, - "CPhoneAudioPlayer::SetRingingTypeProperties - Sample" ); - } - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::SetNewVolumeAndRamptime -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::SetNewVolumeAndRamptime( TInt aVolume, TInt aRamptime ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneAudioPlayer::SetNewVolumeAndRamptime()" ); - - //Check that volume is in valid range. - TInt volume = aVolume<1 ? 1:aVolume; - __PHONELOG1( EBasic, EPhoneControl, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - aVolume(%d)", - aVolume ); - - if ( iFormat == EFormatTone && iTonePlayer ) - { - iTonePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds( aRamptime ) ); - iTonePlayer->SetVolume( ConvertVolume( volume ) ); - __PHONELOG( EBasic, EPhoneControl, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - Tone player" ); - } - else if ( iFormat == EFormatTts && iTtsPlayer ) - { - iTtsPlayer->SetVolumeRamp(TTimeIntervalMicroSeconds( aRamptime ) ); - iTtsPlayer->SetVolume( ConvertVolume( volume ) ); - __PHONELOG( EBasic, EPhoneControl, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - TTS player" ); - } - else - { - iSamplePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds( aRamptime ) ); - iSamplePlayer->SetVolume( ConvertVolume( volume ) ); - __PHONELOG( EBasic, EPhoneControl, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - Sample player" ); - } - - } - - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::ConvertVolume -// ----------------------------------------------------------------------------- -// -TInt CPhoneAudioPlayer::ConvertVolume( TInt aVolume ) - { - //_DDPRINT( 5, "P.AudPlayer.ConvertVolume.aVolume", aVolume ); - - TInt result( 0 ); - - if ( iFormat == EFormatTone && iTonePlayer) - { - result = iTonePlayer->MaxVolume() * aVolume / KMaxVolumeLevel; - } - else if ( iFormat == EFormatTts && iTtsPlayer ) - { - result = iTtsPlayer->MaxVolume() * aVolume / KMaxVolumeLevel; - } - else - { - result = iSamplePlayer->MaxVolume() * aVolume / KMaxVolumeLevel; - } - - // if user has selected minimum volume level - // set HW volume 1 - if ( aVolume == KMinVolumeLevel && result == 0 ) - { - result = 1; - } - - //_DDPRINT( 5, "P.AudPlayer.ConvertVolume.result", result ); - return result; - } - - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::SetTTsToBePlayed -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::SetTTsToBePlayed( TBool aTTsToBePlayed ) - { - iTTsToBePlayed = aTTsToBePlayed; - } - -// ----------------------------------------------------------------------------- -// CPhoneAudioPlayer::MutePlaying -// ----------------------------------------------------------------------------- -// -void CPhoneAudioPlayer::MutePlaying() - { - //_DPRINT( 5, "P.Aud.Mute" ); - if ( iPlayerStatus == ETonePlaying ) - { - if ( iFormat == EFormatTone ) - { - iTonePlayer->SetVolume(0); - } - else if ( iFormat == EFormatTts ) - { - iTtsPlayer->SetVolume(0); - } - else // EFormatSample - { - iSamplePlayer->SetVolume(0); - } - } - else - { - // Mute called during EToneLoading state. - iToBePlaying = EFalse; - } - } - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphoneringingtone.cpp --- a/phoneapp/phoneringingtoneplayer/src/cphoneringingtone.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,434 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -// INCLUDE FILES -#include -#include -#include -#include -#include -#include "cphoneringingtone.h" -#include "cphonecenrepproxy.h" -#include "phonelogger.h" -#include "phoneconstants.h" -#include "phonelogger.h" - -// CONSTANTS -// Rich audio file MIME types -_LIT(KAac, "audio/aac"); -_LIT(KMp3, "audio/mp3"); -_LIT(KMpeg, "audio/mpeg"); -_LIT(K3gpp, "audio/3gpp"); -_LIT(KMp4, "audio/mp4"); -_LIT(KAmrWb, "audio/amr-wb"); -_LIT(KWavX, "audio/x-wav"); -_LIT(KWav, "audio/wav"); - -// Rich video file MIME types -_LIT(KV3gpp, "video/3gpp"); -_LIT(KVMp4, "video/mp4"); -_LIT(KV3gpp2, "video/3gpp2"); - -//file size limit -const TUint KPhoneToneFileSizeLimitKB = 5000; - -// MACROS - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::CPhoneRingingTone -// C++ default constructor can NOT contain any code, that -// might leave. -// ----------------------------------------------------------------------------- -// -CPhoneRingingTone::CPhoneRingingTone( TBool aDrmInPlayback ) : - iDrmInPlayback( aDrmInPlayback ) - { - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::ConstructL -// Symbian 2nd phase constructor can leave. -// ----------------------------------------------------------------------------- -// -void CPhoneRingingTone::ConstructL( const TDesC& aFileName ) - { - iFileName = aFileName.AllocL(); - - GetMaxToneFileSize(); - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::NewL -// Two-phased constructor. -// ----------------------------------------------------------------------------- -// -CPhoneRingingTone* CPhoneRingingTone::NewL( - const TDesC& aFileName, - TBool aDrmInPlayback ) - { - CPhoneRingingTone* self = new( ELeave ) CPhoneRingingTone( - aDrmInPlayback ); - - CleanupStack::PushL( self ); - self->ConstructL( aFileName ); - CleanupStack::Pop( self ); - - return self; - } - -// Destructor -CPhoneRingingTone::~CPhoneRingingTone() - { - delete iFileName; - delete iMimeType; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::SetFileName -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -void CPhoneRingingTone::SetFileName( const TDesC& aFileName ) - { - delete iFileName; - iFileName = NULL; - iFileName = aFileName.Alloc(); - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::SetVolume -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -void CPhoneRingingTone::SetVolume( const TInt aVolume ) - { - iVolume = aVolume; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::SetRingingType -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -void CPhoneRingingTone::SetRingingType( TProfileRingingType aRingingType) - { - iRingingType = aRingingType; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::Volume -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TInt CPhoneRingingTone::Volume() const - { - return iVolume; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::RingingType -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TProfileRingingType CPhoneRingingTone::RingingType() const - { - return iRingingType; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::FileName -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -const TDesC& CPhoneRingingTone::FileName() const - { - // iFileName is never NULL - return *iFileName; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::SetTtsToneToBePlayed -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -void CPhoneRingingTone::SetTtsToneToBePlayed( TBool aTtsToneToBePlayed ) - { - iTtsToneToBePlayed = aTtsToneToBePlayed; - } -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::TtsToneToBePlayed -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingTone::TtsToneToBePlayed() const - { - - return iTtsToneToBePlayed; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::MimeType -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -const TDesC& CPhoneRingingTone::MimeType() const - { - if ( iMimeType ) - { - return *iMimeType; - } - else - { - return KNullDesC; - } - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::IsVideoRingingTone -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingTone::IsVideoRingingTone() - { -#ifdef RD_VIDEO_AS_RINGING_TONE - if ( RefreshMime() != KErrNone ) - { - // try to handle as audio - return EFalse; - } - - TBool isVideo( EFalse ); - - if ( iMimeType && iMimeType->MatchF( KPhoneRingingToneVideoMime ) != - KErrNotFound ) - { - isVideo = ETrue; - } - else if ( iMimeType && iMimeType->MatchF( KPhoneRingingToneRealVideoMime ) != - KErrNotFound ) - { - isVideo = ETrue; - } - - if ( isVideo ) - { - if ( IsFileInRom() && !IsFileInVideoDirectory() ) - { - // For ROM files check also location, because - // MIME check is not fully reliable. - isVideo = EFalse; - } - } - - return isVideo; -#else - // if extended security -> refresh MIME - if ( iDrmInPlayback ) - { - RefreshMime(); - } - - return EFalse; -#endif - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::IsFileDrmProtected -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingTone::IsFileDrmProtected() const - { - const TDesC& type = MimeType(); - - if ( type == KAac || type == KMp3 || type == KMpeg || - type == K3gpp || type == KMp4 || type == KAmrWb || - type == KWavX || type == KWav || type == KV3gpp || - type == KVMp4 || type == KV3gpp2 ) - { - ContentAccess::CContent* content = NULL; - TRAPD( err, content = ContentAccess::CContent::NewL( *iFileName ) ); - if ( err == KErrNone && content ) - { - TInt drmProtected( 0 ); - content->GetAttribute( ContentAccess::EIsProtected, drmProtected ); - delete content; - return drmProtected; - } - } - - return ETrue; // Other MIMEs can be played without DRM check. - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::IsFileInRom -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingTone::IsFileInRom() const - { - TParsePtrC parsedName( *iFileName ); - - // Files on rom are not DRM checked - if ( parsedName.Drive().CompareF( KPhoneRingingToneDriveZ ) == 0 ) - { - return ETrue; - } - else - { - return EFalse; - } - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::IsFileInVideoDirectory -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingTone::IsFileInVideoDirectory() const - { - TParsePtrC parsedName( *iFileName ); - - if ( PathInfo::PathType( parsedName.DriveAndPath() ) == - PathInfo::EVideosPath ) - { - return ETrue; - } - else - { - return EFalse; - } - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::RefreshMime -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -TInt CPhoneRingingTone::RefreshMime() - { - TRAPD( err, RefreshMimeL() ); - return err; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingTone::RefreshMimeL -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -void CPhoneRingingTone::RefreshMimeL() - { - RApaLsSession apaLsSession; - User::LeaveIfError( apaLsSession.Connect() ); - CleanupClosePushL( apaLsSession ); - - TUid dummyUid = { 0 }; - TDataType dataType( dummyUid ); - - User::LeaveIfError( - apaLsSession.AppForDocument( *iFileName, dummyUid, dataType ) ); - - CleanupStack::PopAndDestroy(); // CleanupClosePushL - - delete iMimeType; - iMimeType = NULL; - iMimeType = dataType.Des().AllocL(); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingTone::CheckAndHandleToneSizeLimit() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtone::CheckAndHandleToneSizeLimit()" ); - - TBool bValidSize = ETrue; - - // If user has somehow managed to get a too large file as ringing tone, - // play default tone instead. - if ( iToneFileSizeLimitKB ) - { - if ( CheckToneFileSize( FileName(), iToneFileSizeLimitKB) != KErrNone ) - { - bValidSize = EFalse; - } - } - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneRingingtone::CheckAndHandleToneSizeLimit - bValidSize(%d)", - bValidSize); - - return bValidSize; - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -TInt CPhoneRingingTone::CheckToneFileSize( const TDesC& aFile, - TInt aSizeLimitKB ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtone::CheckToneFileSize()" ); - //return KErrNone; - - // Get file size - TInt size = 0; - - RFs fs; - TInt error = fs.Connect(); - TEntry entry; - if ( KErrNone == error ) - { - if (KErrNone == fs.Entry( aFile, entry )) - { - size = entry.iSize; - } - - // Check - aSizeLimitKB *= Kkilo; - if ( aSizeLimitKB && size > aSizeLimitKB ) - { - error = KErrTooBig; - } - } - - fs.Close(); - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneRingingtonePlayer::CheckToneFileSize - size (%d)", - size ); - return error; - - } - - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingTone::GetMaxToneFileSize() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtone::GetMaxToneFileSize()" ); - iToneFileSizeLimitKB = KPhoneToneFileSizeLimitKB; - } - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphoneringingtonecontroller.cpp --- a/phoneapp/phoneringingtoneplayer/src/cphoneringingtonecontroller.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,588 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -// INCLUDE FILES -#include -#include "cphoneringingtonecontroller.h" -#include "phonelogger.h" -#include "cphoneringingtone.h" -#include "tphonecmdparamringtone.h" -#include "cphonecenrepproxy.h" -#include "cphoneringingtoneplayer.h" -#include "cphonettsplayer.h" - -// CONSTANTS - - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::NewL -// ----------------------------------------------------------------------------- -// -EXPORT_C CPhoneRingingToneController* CPhoneRingingToneController::NewL() - { - CPhoneRingingToneController* self = - new ( ELeave ) CPhoneRingingToneController(); - - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::CPhoneRingingToneController -// ----------------------------------------------------------------------------- -// -CPhoneRingingToneController::CPhoneRingingToneController() - { - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ConstructL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::ConstructL() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::ConstructL()" ); - //iMediatorSender = CPhoneMediatorSender::NewL(); - //iMediatorSender->AttachCoverUiObserverL( this ); - - iRingingtonePlayer = CPhoneRingingtonePlayer::NewL(); - - // Check video player configuration. - iArbitraryVideoScaling = - CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported( - KTelephonyLVFlagArbitraryVideoScaling ); - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::~CPhoneRingingToneController -// ----------------------------------------------------------------------------- -// -CPhoneRingingToneController::~CPhoneRingingToneController() - { - /*if ( iMediatorSender ) - { - iMediatorSender->DetachCoverUiObserver( this ); - }*/ - - //delete iMediatorSender; - //iMediatorSender = NULL - - - delete iAudioVideoRingingTone; - iAudioVideoRingingTone = NULL; - delete iTTSPlayer; - iTTSPlayer = NULL; - delete iRingingtonePlayer; - iRingingtonePlayer = NULL; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayRingToneL -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::PlayRingToneL( - TPhoneCommandParam* aCommandParam ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::PlayRingToneL()" ); - - if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdRingTone ) - { - TPhoneCmdParamRingTone* ringToneParam = - static_cast( aCommandParam ); - - const TInt volume = ringToneParam->Volume(); - TProfileRingingType ringingType = - static_cast( ringToneParam->RingingType() ); - - if ( !iAudioVideoRingingTone ) - { - iAudioVideoRingingTone = CPhoneRingingTone::NewL( - ringToneParam->RingTone() ); - } - - // Store pofile based parameters. - iAudioVideoRingingTone->SetFileName( ringToneParam->RingTone() ); - iAudioVideoRingingTone->SetVolume( volume ); - iAudioVideoRingingTone->SetRingingType ( ringingType ); - iAudioVideoRingingTone->SetTtsToneToBePlayed( - ringToneParam->TextToSay().Length()? ETrue : EFalse); - - - // Caller contact text and image and image has - // higher priority than video ringing tone set for caller. - if ( iAudioVideoRingingTone->IsVideoRingingTone() ) - { - if ( ringToneParam->IsCallerImage() ) - { - // Play only audio from video ringingtone - PlayAudioRingTone( - volume, - ringingType ); - } - else - { - // Play video ring tone - const TBool ringToneIsPersonal = ringToneParam->Type() == - EPhoneRingTonePersonal; - PlayVideoRingingTone( - *iAudioVideoRingingTone, - volume, - ringingType, - ringToneIsPersonal ); - } - } - else - { - // Play text to speech, if available - if ( ringToneParam->TextToSay().Length() ) - { - if (iTTSPlayer) - { - delete iTTSPlayer; - iTTSPlayer = NULL; - } - iTTSPlayer = CPhoneTTSPlayer::NewL(iRingingtonePlayer); - iTTSPlayer->AddTtsPlaybackIfNeeded(); - iTTSPlayer->PlayTtsTone( - ringToneParam->TextToSay(), - iAudioVideoRingingTone ); - } - // Play audio ring tone - PlayAudioRingTone( - volume, - ringingType ); - } - } - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayAudioRingTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::PlayAudioRingTone( - TInt aVolume, - TProfileRingingType aRingingType ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::PlayAudioRingTone()" ); - __PHONELOG2( - EBasic, - EPhoneControl, - "CPhoneRingingToneController::PlayAudioRingTone - aVolume(%d), aRingingType(%d)", - aVolume, - aRingingType ); - - if ( !iAudioVideoRingingTone || - !iAudioVideoRingingTone->CheckAndHandleToneSizeLimit() ) - { - iRingingtonePlayer->PlayDefaultTone( aVolume, aRingingType ); - } - else if ( aRingingType == EProfileRingingTypeSilent ) - { - iRingingtonePlayer->PlaySilentTone(); - } - else if ( aRingingType == EProfileRingingTypeBeepOnce ) - { - iRingingtonePlayer->PlayBeepOnce( aVolume ); - } - else - { - iRingingtonePlayer->PlayProfileBasedTone(iAudioVideoRingingTone); - } - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::MuteRingingToneOnAnswer -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::MuteRingingToneOnAnswer() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::MuteRingingToneOnAnswer()" ); - - /* if ( iVideoPlayer && iTonePlayingStatus == EVideoTonePlaying || - iTonePlayingStatus == EPersonalVideoTonePlaying ) - { - // Mute the video audio - iVideoPlayer->MuteVideoRingTone(); - iTonePlayingStatus = ESilentVideoTonePlaying; - iVolume = 0; - } - else - {*/ - DoMuteRingingTone(); - //} - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::MuteRingingTone -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::MuteRingingTone() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::MuteRingingTone()" ); - - /* if ( iVideoPlayer && iTonePlayingStatus == EVideoTonePlaying || - iTonePlayingStatus == EPersonalVideoTonePlaying ) - { - // Mute the video audio - iVideoPlayer->MuteVideoRingTone(); - iTonePlayingStatus = ESilentVideoTonePlaying; - iVolume = 0; - } - else - {*/ - StopPlaying(); - //} - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::StopPlaying -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::StopPlaying() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::StopPlaying()" ); - if ( iTTSPlayer ) - { - iTTSPlayer->StopPlaying(); - delete iTTSPlayer; - iTTSPlayer = NULL; - } - iRingingtonePlayer->StopPlaying(); - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::DoMuteRingingTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::DoMuteRingingTone() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::DoMuteRingingTone()" ); - - /* switch( iTonePlayingStatus ) - { - case EVideoTonePlaying: // video ringing tone, fall through - case EPersonalVideoTonePlaying: // fall through - case ESilentVideoTonePlaying: - if ( iVideoPlayer ) - { - iVideoPlayer->MuteVideoRingTone(); - return; - } - break; - - default: - break; - }*/ - - iRingingtonePlayer->MuteActiveAudioPlayer(); - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ConvertVideoRingingType -// ----------------------------------------------------------------------------- -// -MPhoneVideoPlayer::TPlayMode CPhoneRingingToneController::ConvertVideoRingingType( - TProfileRingingType aRingingType ) - { - MPhoneVideoPlayer::TPlayMode playMode; - - switch ( aRingingType ) - { - case EProfileRingingTypeAscending: - playMode = MPhoneVideoPlayer::EPlayAscending; - break; - case EProfileRingingTypeRingingOnce: - playMode = MPhoneVideoPlayer::EPlayOnce; - break; - case EProfileRingingTypeRinging: - default: - playMode = MPhoneVideoPlayer::EPlayInLoop; - break; - } - - return playMode; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::SetVideoPlayer -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::SetVideoPlayer( - MPhoneVideoPlayer* aVideoPlayer ) - { - iVideoPlayer = aVideoPlayer; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayVideoRingingTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::PlayVideoRingingTone( - const CPhoneRingingTone& /*aRingingTone*/, - TInt /*aVolume*/, - TProfileRingingType /*aRingingType*/, - TBool /*aPersonalTone*/ ) - { - /* - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::PlayVideoRingingTone()" ); - - __ASSERT_DEBUG( iVideoPlayer, Panic( EPhoneViewGeneralError ) ); - - iVolume = aVolume; - iRingingType = aRingingType; - TBool startTimer( ETrue ); - - // Extended security check - if ( ExtendedSecurity() ) - { - if ( !aRingingTone.IsFileInRom() && - !aRingingTone.IsFileDrmProtected() ) - { - __PHONELOG( EBasic, - EPhoneControl, - "CPhoneRingingToneController::HandleVideoPlayerError - PermissionDenied" ); - iRingingtonePlayer->PlayDefaultTone( iVolume, iRingingType ); - return; - } - __PHONELOG( EBasic, - EPhoneControl, - "CPhoneRingingToneController::HandleVideoPlayerError - ExtSecChk ok" ); - } - - // If flip is closed then show video on Cover UI - TBool videoPlaySentToCoverUi( EFalse ); - TInt leaveCode( KErrNone ); - if ( FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) ) - { - const TInt flipOpen = CPhonePubSubProxy::Instance()->Value( - KPSUidUikon, KUikFlipStatus ); - if( !flipOpen ) - { - TRAP( leaveCode, videoPlaySentToCoverUi = CoverUIPlayVideoRingingToneL( - aRingingTone ) ); - } - } - // Play ringing tone here if video play sending did leave or - // video playing wasn't delegated to Cover UI - if( !leaveCode && videoPlaySentToCoverUi ) - { - iTimer->After( KPhoneMaxRingingWaiting, this ); - return; - } - - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingToneController::PlayVideoRingingTone - play" ); - switch( aRingingType ) - { - case EProfileRingingTypeSilent: - iVideoPlayer->PlayVideoRingTone( - aRingingTone.FileName(), - ConvertVideoRingingType( aRingingType ), - 0, - iArbitraryVideoScaling, - this ); - iRingingtonePlayer->PlaySilentTone(); - iVolume = 0; // for repeat - startTimer = EFalse; // no need for fallback - break; - - case EProfileRingingTypeBeepOnce: - iVideoPlayer->PlayVideoRingTone( - aRingingTone.FileName(), - ConvertVideoRingingType( aRingingType ), - 0, - iArbitraryVideoScaling, - this ); - iRingingtonePlayer->BeepOnce( aVolume ); - iVolume = 0; // for repeat - startTimer = EFalse; // no need for fallback - break; - default: - iVideoPlayer->PlayVideoRingTone( - aRingingTone.FileName(), - ConvertVideoRingingType( aRingingType ), - iVolume, - iArbitraryVideoScaling, - this ); - break; - } - - if ( aPersonalTone ) - { - iTonePlayingStatus = EPersonalVideoTonePlaying; - } - else - { - iTonePlayingStatus = EVideoTonePlaying; - } - - if ( startTimer && !iTimer->IsActive() ) - { - // Start timer to guard video opening - iTimer->After( KPhoneMaxRingingWaiting, this ); - } - */ - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::HandleVideoPlayerError -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::HandleVideoPlayerError( - TPhoneVideoPlayerErrorEvent /*aEvent*/, - TInt /*aError*/ ) - { - /* __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::HandleVideoPlayerError()" ); - - if ( aError ) - { - __PHONELOG1( EBasic, - EPhoneControl, - "CPhoneRingingToneController::HandleVideoPlayerError - error (%d)", - aError ); - } - - // cancel guarding timer - iTimer->Cancel(); - - // to remove video window - iVideoPlayer->CancelVideoRingTone(); - - if ( iTonePlayingStatus == EPersonalVideoTonePlaying ) - { - // Play default tone (active profile tone). - if ( iAudioVideoRingingTone && - !iAudioVideoRingingTone->IsVideoRingingTone() ) - { - PlayAudioRingTone( iVolume, iRingingType ); - } - else // audio/video tone is video - { - PlayDefaultVideoAsync(); - } - } - else - { - // Play backup tone - iRingingtonePlayer->PlayDefaultTone( iVolume, iRingingType ); - } -*/ - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::HandleVideoPlayerInitComplete -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::HandleVideoPlayerInitComplete() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::HandleVideoPlayerInitComplete()" ); - - // cancel guarding timer - //iTimer->Cancel(); - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::HandleVideoPlayerPlayingComplete -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::HandleVideoPlayerPlayingComplete() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::HandleVideoPlayerPlayingComplete()" ); - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayDefaultVideoAsync -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::PlayDefaultVideoAsync() - { - /* __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::PlayDefaultVideoAsync()" ); - - Cancel(); - - iState = EPlayingDefaultVideo; - - TRequestStatus* status = &iStatus; - User::RequestComplete( status, KErrNone ); - SetActive();*/ - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ExtendedSecurity -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingToneController::ExtendedSecurity() const - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::ExtendedSecurity()" ); - return EFalse; - //return iExtSecNeeded; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::CoverUIPlayVideoRingingToneL -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingToneController::CoverUIPlayVideoRingingToneL( - const CPhoneRingingTone& aRingingTone ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::CoverUIPlayVideoRingingToneL()" ); - - TBool showVideo( EFalse ); - - RBuf8 data; - CleanupClosePushL( data ); - data.CreateL( aRingingTone.FileName().Length() ); - data.Copy( aRingingTone.FileName() ); - /*TInt err = iMediatorSender->IssueCommand( - EPhoneCmdCoverUiShowMultimediaRingingTone, - data ); - if ( err == KErrNone ) - { - showVideo = ETrue; - iActiveCoverUICommand = ETrue; - }*/ - CleanupStack::PopAndDestroy(); //data - - return showVideo; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ShowMultimediaRingingToneResponseL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::ShowMultimediaRingingToneResponseL( - TInt aStatus ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::ShowMultimediaRingingToneResponseL()" ); - - //iTimer->Cancel(); - if( aStatus != KErrNone && iActiveCoverUICommand ) - { - iRingingtonePlayer->PlayDefaultTone( iVolume, iRingingType ); - } - iActiveCoverUICommand = EFalse; - } - - - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphoneringingtoneplayer.cpp --- a/phoneapp/phoneringingtoneplayer/src/cphoneringingtoneplayer.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,967 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "cphoneringingtoneplayer.h" -#include "cphoneaudioplayer.h" -#include "cphoneringingtone.h" -#include "phonelogger.h" -#include "cphonecenrepproxy.h" -#include "cphonepubsubproxy.h" -#include "cphonetimer.h" -#include "phoneconstants.h" -#include "phoneui.pan" - -CPhoneRingingtonePlayer::CPhoneRingingtonePlayer(): -CActive( CActive::EPriorityStandard ), iAsyncDeletePlayers( EPlayerCount ) -{ - CActiveScheduler::Add( this ); -} - -CPhoneRingingtonePlayer::~CPhoneRingingtonePlayer() - { - iAsyncDeletePlayers.ResetAndDestroy(); - iAsyncDeletePlayers.Close(); - - delete iTimer; - - CleanupPlayers(); - - Cancel(); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::CleanupPlayers() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::CleanupPlayers()" ); - - delete iAudioPlayer; - iAudioPlayer = NULL; - delete iDefaultPlayer; - iDefaultPlayer = NULL; - delete iBeepOncePlayer; - iBeepOncePlayer = NULL; - delete iSilentPlayer; - iSilentPlayer = NULL; - delete iBackupPlayer; - iBackupPlayer = NULL; - delete iMdaServer; - iMdaServer = NULL; - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CPhoneRingingtonePlayer* CPhoneRingingtonePlayer::NewL() - { - CPhoneRingingtonePlayer* self = - new ( ELeave ) CPhoneRingingtonePlayer(); - - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructL() - { - - // Construct timer. - iTimer = CPhoneTimer::NewL(); - - for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ ) - { - User::LeaveIfError( - iAsyncDeletePlayers.Append( NULL ) ); - } - - //disabling the DRM for the TB10.1wk46 release. Lets see if need to put it back and how. - //iExtSecNeeded = ( ( err == KErrNone ) && extSecNeeded ) ? ETrue : EFalse; - iExtSecNeeded = EFalse; - - // Construct players. - if ( !iMdaServer ) - { - iMdaServer = CMdaServer::NewL(); - } - - // Backup player. - ConstructBackupPlayer(); - ConstructDefaultPlayerL(); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayProfileBasedTone( CPhoneRingingTone* aAudioVideoRingingTone ) - { - iAudioVideoRingingTone = aAudioVideoRingingTone; - // Construct player for line 1. - if ( !iAudioPlayer ) - { - iAudioPlayer = ConstructTonePlayer( - *iAudioVideoRingingTone, - EPlayerAudio ); - if ( !iTimer->IsActive() ) - { - // Start timer, since the player is constructed. - iTimer->After( KPhoneMaxRingingWaiting, this ); - } - } - - // Start playing. - if ( !iAudioPlayer ) - { - iTimer->Cancel(); - PlayDefaultTone( aAudioVideoRingingTone->Volume(), - aAudioVideoRingingTone->RingingType() ); - } - else - { - __PHONELOG( - EBasic, - EPhoneControl, - "CPhoneRingingtonePlayer::PlayAudioRingTone - Start playing audio" ); - iVolume = aAudioVideoRingingTone->Volume(); - iRingingType = aAudioVideoRingingTone->RingingType(); - //AddTtsPlaybackIfNeeded( aRingingType ); - iTonePlayingStatus = EAudioTonePlaying; - iAudioPlayer->Play( - ConvertRingingType( aAudioVideoRingingTone->RingingType() ), - aAudioVideoRingingTone->Volume(), - aAudioVideoRingingTone->TtsToneToBePlayed()); - } - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayBeepOnce( TInt aVolume ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::BeepOnce()" ); - __PHONELOG1( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::BeepOnce - aVolume(%d)", - aVolume ); - - if ( !iBeepOncePlayer ) - { - ConstructSequencePlayer( EPlayerBeepOnce ); - } - - if ( iBeepOncePlayer ) - { - __PHONELOG( - EBasic, - EPhoneControl, - "CPhoneRingingtonePlayer::BeepOnce - Play" ); - iTonePlayingStatus = EBeepOnce; - iBeepOncePlayer->Play( CPhoneAudioPlayer::ETypeRingingOnce, - aVolume, EFalse ); - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlaySilentTone() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::PlaySilentTone()" ); - - if ( !iSilentPlayer ) - { - ConstructSequencePlayer( EPlayerSilent ); - } - - if ( iSilentPlayer ) - { - __PHONELOG( - EBasic, - EPhoneControl, - "CPhoneRingingtonePlayer::PlaySilentTone - play" ); - iTonePlayingStatus = ESilentTonePlaying; - iSilentPlayer->Play( CPhoneAudioPlayer::ETypeRinging, 0, EFalse ); - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayDefaultTone( - TInt aVolume, - TProfileRingingType aRingingType ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::PlayDefaultTone()" ); - - if( aRingingType == EProfileRingingTypeSilent || - aRingingType == EProfileRingingTypeBeepOnce ) - { - return; - } - - if ( !iDefaultRingingTone ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::PlayDefaultTone - default tone does not exist, play backup..." ); - PlayBackupTone( aVolume, aRingingType ); - return; - } - - // Construct player. - if ( !iDefaultPlayer ) - { - iDefaultPlayer = ConstructTonePlayer( - *iDefaultRingingTone, - EPlayerDefault ); - if ( !iTimer->IsActive() ) - { - iTimer->After( KPhoneMaxRingingWaiting, this ); - } - } - - // Start playing backup. - if ( !iDefaultPlayer ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::PlayDefaultTone - player not constructed, play backup..." ); - iTimer->Cancel(); - PlayBackupTone( aVolume, aRingingType ); - } - else - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::PlayDefaultTone - play" ); - iVolume = aVolume; - iRingingType = aRingingType; - iTonePlayingStatus = EDefaultTonePlaying; - iDefaultPlayer->Play( - ConvertRingingType( aRingingType ), aVolume, - iAudioVideoRingingTone->TtsToneToBePlayed()); - } - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::PlayBackupTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayBackupTone( - TInt aVolume, - TProfileRingingType aRingingType ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::PlayBackupTone()" ); - __ASSERT_DEBUG( iBackupPlayer, Panic( EPhoneViewGeneralError ) ); - - if ( !iBackupPlayer ) - { - ConstructBackupPlayer(); - } - - if ( iBackupPlayer ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::PlayBackupTone - play" ); - iTonePlayingStatus = EBackupTonePlaying; -/* - // playing text-to-speech, if necessary - iTtsToneToBePlayed = EFalse; - iTTsTimeOutCounter = 0; - iTtsDelayTimer->Cancel(); - if ( iTtsPlayer ) - { - iTtsPlayer->StopPlaying(); - delete iTtsPlayer; - iTtsPlayer = NULL; - }*/ - - iBackupPlayer->Play( - ConvertRingingType( aRingingType ), aVolume, EFalse ); - } - } - - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::StopPlaying() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::StopPlaying()" ); - - iTimer->Cancel(); - - switch( iTonePlayingStatus ) - { - case EAudioTonePlaying: - if( iAudioPlayer ) - { - iAudioPlayer->StopPlaying(); - delete iAudioPlayer; - iAudioPlayer = NULL; - } - break; - case EDefaultTonePlaying: - if ( iDefaultPlayer ) - { - iDefaultPlayer->StopPlaying(); - delete iDefaultPlayer; - iDefaultPlayer = NULL; - } - break; - case EBeepOnce: - if( iBeepOncePlayer ) - { - iBeepOncePlayer->StopPlaying(); - delete iBeepOncePlayer; - iBeepOncePlayer = NULL; - } - break; - case EBackupTonePlaying: - if( iBackupPlayer ) - { - iBackupPlayer->StopPlaying(); - } - break; - case ESilentTonePlaying: - if( iSilentPlayer ) - { - iSilentPlayer->StopPlaying(); - delete iSilentPlayer; - iSilentPlayer = NULL; - } - break; - case EVideoTonePlaying: // video ringing tone - case EPersonalVideoTonePlaying: - case ESilentVideoTonePlaying: - if ( iBeepOncePlayer ) - { - iBeepOncePlayer->StopPlaying(); - delete iBeepOncePlayer; - iBeepOncePlayer = NULL; - } - - if ( iSilentPlayer ) - { - iSilentPlayer->StopPlaying(); - delete iSilentPlayer; - iSilentPlayer = NULL; - } - /*if ( iVideoPlayer ) - { - iVideoPlayer->StopVideoRingTone(); - }*/ - if ( iAudioVideoRingingTone ) - { - delete iAudioVideoRingingTone; - iAudioVideoRingingTone = NULL; - } - break; - case EIdle: - // Do nothing here. - return; - default: - Panic( EPhoneViewCaseNotHandled ); - break; - } - - iTonePlayingStatus = EIdle; - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* CPhoneRingingtonePlayer::ConstructTonePlayer( - const CPhoneRingingTone& aRingingTone, - TInt aId ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::ConstructTonePlayer()" ); - return CPhoneAudioPlayer::New( - aRingingTone, - KAudioPriorityPhoneCall, - KAudioPrefIncomingCall, - *this, - aId, - iMdaServer, - aId == EPlayerDefault ? EFalse : iExtSecNeeded ); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -TInt CPhoneRingingtonePlayer::ConstructBackupPlayer() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::ConstructBackupPlayer()" ); - TRAPD( err, ConstructBackupPlayerL() ); - return err; - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructBackupPlayerL() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::ConstructBackupPlayerL()" ); - - // Construct Backup player. - if ( !iBackupPlayer ) - { - TFileName defaultSoundFile( KDriveZ ); - defaultSoundFile.Append( KPhoneDefaultSoundFile ); - iBackupPlayer = CPhoneAudioPlayer::NewL( - defaultSoundFile, - KAudioPriorityPhoneCall, - KAudioPrefIncomingCall, - *this, - EPlayerBackup, - iMdaServer - ); - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructDefaultPlayerL() - { - // Construct the default ringing tone - TBuf defaultTone; - defaultTone = _L("z:\\data\\sounds\\digital\\Nokia tune.aac"); - TInt err(KErrNone); - - if ( err == KErrNone ) - { - iDefaultRingingTone = CPhoneRingingTone::NewL( defaultTone ); - } - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructSequencePlayer( TPlayerId aId ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::ConstructSequencePlayer()" ); - - // Construct players. - TRAPD( err, ConstructSequencePlayerL( aId ) ); - if ( err ) - { - __PHONELOG1( EBasic, EPhoneControl, - "CPhoneRingingtonePlayer::ConstructSequencePlayer - err(%d)", err ); - } - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructSequencePlayerL( TPlayerId aId ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::ConstructSequencePlayerL()" ); - // Construct beep once player - if ( aId == EPlayerBeepOnce ) - { -#ifdef __WINS__ - TParse* fp = new (ELeave) TParse(); - fp->Set( KPhoneBeepOnceSoundFile, &KDC_RESOURCE_FILES_DIR, NULL ); - TFileName fileName( fp->FullName() ); - delete fp; - - iBeepOncePlayer = CPhoneAudioPlayer::NewL( - fileName, - KAudioPriorityPhoneCall, - KAudioPrefIncomingCall, - *this, - EPlayerBeepOnce ); -#else - iBeepOncePlayer = CPhoneAudioPlayer::NewSeqL( - KPhoneBeepSequence(), - KAudioPriorityPhoneCall, - KAudioPrefIncomingCall, - *this, - EPlayerBeepOnce ); -#endif // __WINS__ - } - - // Construct Silent Player. - else if ( aId == EPlayerSilent ) - { -#ifdef __WINS__ - TParse* fp = new (ELeave) TParse(); - fp->Set( KPhoneSilentSoundFile, &KDC_RESOURCE_FILES_DIR, NULL ); - TFileName fileName( fp->FullName() ); - delete fp; - - iSilentPlayer = CPhoneAudioPlayer::NewL( - fileName, - KAudioPriorityPhoneCall, - KAudioPrefIncomingCall, - *this, - EPlayerSilent ); -#else - iSilentPlayer = CPhoneAudioPlayer::NewSeqL( - KPhoneNoSoundSequence(), - KAudioPriorityPhoneCall, - KAudioPrefIncomingCall, - *this, - EPlayerSilent ); -#endif // __WINS__ - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleAudioPlayerError( - TPhoneAudioPlayerErrorEvent /*aEvent*/, - TInt aError, - TInt /*aId*/ ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::HandleAudioPlayerError()" ); - // This is called from CPhoneAudioPlayer - we do not - // want to delete instances from which this method - // is called. - - __PHONELOG1( EBasic, - EPhoneControl, - "CPhoneRingingtonePlayer::HandleAudioPlayerError - error (%d)", - aError ); - - const TBool deleteAll = ( aError == KErrServerTerminated ); - - if ( deleteAll ) - { - // KErrServerTerminated is considered as fatal error. So we - // need to delete everything. - - for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ ) - { - DeletePlayerAsync( static_cast< TPlayerId >( i ) ); - } - - // Now all member audio players point to NULL, except - // those players in iAsyncDeletePlayers. Recreate - // players. - - ConstructBackupPlayer(); // Ignore error code. - } - - iTimer->Cancel(); - DoHandlePlayerError( !deleteAll, EFalse ); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleAudioPlayerInitComplete( TInt aId ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::HandleAudioPlayerInitComplete()" ); - // This is called from CPhoneAudioPlayer - we do not - // want to delete instances from which this method - // is called. - - if ( iTonePlayingStatus == EAudioTonePlaying && aId == EPlayerAudio || - iTonePlayingStatus == EDefaultTonePlaying && aId == EPlayerDefault ) - { - iTimer->Cancel(); - } - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::HandlePlayingComplete -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandlePlayingComplete( TInt /*aId*/ ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::HandlePlayingComplete()" ); - // This is called from CPhoneAudioPlayer - we do not - // want to delete instances from which this method - // is called. - - - __PHONELOG1( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::HandlePlayingComplete - delete player - iTonePlayingStatus(%d)", - iTonePlayingStatus ); -/* if (iAudioVideoRingingTone->TtsToneToBePlayed() && - iAudioVideoRingingTone->RingingType() == EProfileRingingTypeRinging ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::HandlePlayingComplete - return" ); - return; - }*/ - - switch( iTonePlayingStatus ) - { - case EAudioTonePlaying: - DeletePlayerAsync( EPlayerAudio ); - iAudioPlayer = NULL; - break; - - case EDefaultTonePlaying: - DeletePlayerAsync( EPlayerDefault ); - iDefaultPlayer = NULL; - break; - - case ESilentTonePlaying: - DeletePlayerAsync( EPlayerSilent ); - iSilentPlayer = NULL; - break; - - case EBeepOnce: - DeletePlayerAsync( EPlayerBeepOnce ); - iBeepOncePlayer = NULL; - break; - - case EVideoTonePlaying: - case EPersonalVideoTonePlaying: - DeletePlayerAsync( EPlayerBeepOnce ); - iBeepOncePlayer = NULL; - return; // beep once + video - - case EBackupTonePlaying: - break; - - default: - Panic( EPhoneViewCaseNotHandled ); - break; - } - - iTonePlayingStatus = EIdle; - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::DeletePlayerAsync( TPlayerId aPlayer ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::DeletePlayerAsync()" ); - __ASSERT_DEBUG( aPlayer >= EPlayerFirst && aPlayer < iAsyncDeletePlayers.Count(), - Panic( EPhoneViewInvariant ) ); - - // Player is not deleted here, but in RunL. - Cancel(); - - if ( iAsyncDeletePlayers[ aPlayer ] ) - { - delete iAsyncDeletePlayers[ aPlayer ]; - iAsyncDeletePlayers[ aPlayer ] = NULL; - } - - CPhoneAudioPlayer** players[] = - { - &iAudioPlayer, - &iBeepOncePlayer, - &iSilentPlayer, - &iDefaultPlayer, - &iBackupPlayer, - &iTtsPlayer - }; - - __ASSERT_DEBUG( iAsyncDeletePlayers.Count() > aPlayer, Panic( EPhoneUtilsIndexOutOfBounds ) ); - iAsyncDeletePlayers[ aPlayer ] = - *(players[ aPlayer ]); - *(players[ aPlayer ]) = NULL; - - iState = EDeletingAudioPlayer; - - TRequestStatus* status = &iStatus; - User::RequestComplete( status, KErrNone ); - SetActive(); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::RunL() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::RunL()" ); - - switch ( iState ) - { - case EDeletingAudioPlayer: - { - for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ ) - { - delete iAsyncDeletePlayers[ i ]; - iAsyncDeletePlayers[ i ] = NULL; - } - } - break; - - case EPlayingDefaultVideo: - { - //PlayAudioRingTone( iVolume, iRingingType ); - } - break; - - case EIdleState: - default: - break; - } // switch iState - - iState = EIdleState; - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::DoCancel() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::DoCancel()" ); - // Request is completed immediately before SetActive. - } - - -// ----------------------------------------------------------- -// CPhoneRingingtonePlayer::HandleCenRepChangeL -// ----------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleCenRepChangeL( - const TUid& aUid, - const TUint /*aId*/ ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::HandleCenRepChangeL()"); - - if ( aUid == KCRUidDRMHelperServer ) - { - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleTimeOutL() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::HandleTimeOutL()" ); - /* if( iActiveCoverUICommand ) - { - iMediatorSender->CancelCommand( - EPhoneCmdCoverUiShowMultimediaRingingTone ); - PlayDefaultTone( iVolume, iRingingType ); - iActiveCoverUICommand = EFalse; - }*/ - - // Guarding timer for startup has expired - if ( iTonePlayingStatus == EVideoTonePlaying || - iTonePlayingStatus == ESilentVideoTonePlaying || - iTonePlayingStatus == EPersonalVideoTonePlaying ) - { - //iVideoPlayer->CancelVideoRingTone(); // close video ringtone display - PlayDefaultTone( iVolume, iRingingType ); - } - else - { - // Start new audio player synchronously. - DoHandlePlayerError( ETrue, ETrue ); - } - - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::DoHandlePlayerError(TBool aDelete, TBool aSync ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::DoHandlePlayerError()" ); - switch ( iTonePlayingStatus ) - { - case EAudioTonePlaying: - if ( aDelete ) - { - if ( aSync ) - { - delete iAudioPlayer; - } - else - { - DeletePlayerAsync( EPlayerAudio ); - } - - iAudioPlayer = NULL; - } - -#ifdef __WINS__ - //PlayAudioRingTone( iVolume, iRingingType ); - iTonePlayingStatus = EDefaultTonePlaying; -#else - PlayDefaultTone( iVolume, iRingingType ); -#endif - break; - case EDefaultTonePlaying: - if ( aDelete ) - { - if ( aSync ) - { - delete iDefaultPlayer; - } - else - { - DeletePlayerAsync( EPlayerDefault ); - } - - iDefaultPlayer = NULL; - } - - PlayBackupTone( iVolume, iRingingType ); - break; - case ESilentTonePlaying: - case EBeepOnce: - case EBackupTonePlaying: - break; - default: - break; - } - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer::TRingingType CPhoneRingingtonePlayer::ConvertRingingType( - TProfileRingingType aRingingType ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::ConvertRingingType()" ); - - CPhoneAudioPlayer::TRingingType ringingType = - CPhoneAudioPlayer::ETypeRinging; - switch ( aRingingType ) - { - case EProfileRingingTypeRinging: - ringingType = CPhoneAudioPlayer::ETypeRinging; - break; - - case EProfileRingingTypeAscending: - ringingType = CPhoneAudioPlayer::ETypeAscending; - break; - - case EProfileRingingTypeRingingOnce: - ringingType = CPhoneAudioPlayer::ETypeRingingOnce; - break; - - default: - break; - } - return ringingType; - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* -CPhoneRingingtonePlayer::GetCurrentlyActiveAudioPlayer() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::GetCurrentlyActiveAudioPlayerWithTTs()" ); - - if( iAudioPlayer ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::GetCurrentlyActiveAudioPlayerWithTTs - audio player" ); - return iAudioPlayer; - } - else if ( iDefaultPlayer ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::GetCurrentlyActiveAudioPlayerWithTTs - default player" ); - return iDefaultPlayer; - } - else if( iBackupPlayer ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneRingingtonePlayer::GetCurrentlyActiveAudioPlayerWithTTs - backup player" ); - return iBackupPlayer; - } - else - { - return NULL; - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::MuteActiveAudioPlayer() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtonePlayer::ActiveAudioPlayer()" ); - - switch( iTonePlayingStatus ) - { - case EAudioTonePlaying: - if( iAudioPlayer ) - { - iAudioPlayer->MutePlaying(); - } - break; - - case EDefaultTonePlaying: - if ( iDefaultPlayer ) - { - return iDefaultPlayer->MutePlaying(); - } - break; - - case EBeepOnce: - if( iBeepOncePlayer ) - { - return iBeepOncePlayer->MutePlaying(); - } - break; - - case EBackupTonePlaying: - if( iBackupPlayer ) - { - return iBackupPlayer->MutePlaying(); - } - break; - - case ESilentTonePlaying: - if( iSilentPlayer ) - { - return iSilentPlayer->MutePlaying(); - } - break; - - case EVideoTonePlaying: // video ringing tone - case EPersonalVideoTonePlaying: - case ESilentVideoTonePlaying: - if ( iBeepOncePlayer ) - { - return iBeepOncePlayer->MutePlaying(); - } - else if ( iSilentPlayer ) - { - return iSilentPlayer->MutePlaying(); - } - break; - - default: - break; - } - } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphonetoneserver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/src/cphonetoneserver.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,157 @@ +/* +* Copyright (c) 2010 - 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: Ringing tone server. +* +*/ + + +// INCLUDE FILES +#include +#include + +#include "phoneringingtonetrace.h" +#include "cphonetoneserver.h" +#include "cphonetoneserversession.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::CPhoneToneServer +// ----------------------------------------------------------------------------- +// +CPhoneToneServer::CPhoneToneServer() + : CServer2( EPriorityHigh ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::CPhoneToneServer <"); + PHONERINGINGTONE_PRINT("CPhoneToneServer::CPhoneToneServer >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::~CPhoneToneServer +// ----------------------------------------------------------------------------- +// +CPhoneToneServer::~CPhoneToneServer() + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::~CPhoneToneServer <"); + PHONERINGINGTONE_PRINT("CPhoneToneServer::~CPhoneToneServer >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::NewLC +// ----------------------------------------------------------------------------- +// +CPhoneToneServer* CPhoneToneServer::NewLC() + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::NewLC <"); + CPhoneToneServer* self = new( ELeave )CPhoneToneServer; + CleanupStack::PushL( self ); + self->ConstructL(); + PHONERINGINGTONE_PRINT("CPhoneToneServer::NewLC >"); + return self; + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::ConstructL +// ----------------------------------------------------------------------------- +// +void CPhoneToneServer::ConstructL() + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::ConstructL <"); + StartL( KRingingToneServerName ); + PHONERINGINGTONE_PRINT("CPhoneToneServer::ConstructL >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::NewSessionL +// ----------------------------------------------------------------------------- +// +CSession2* CPhoneToneServer::NewSessionL( const TVersion& /*aVersion*/, + const RMessage2& /*aMessage*/ ) const + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::NewSessionL <"); + if ( iHasConnection ) + { + // Server should be unique connectable. + User::Leave( KErrAccessDenied ); + //return NULL; + } + CSession2* session = CPhoneToneServerSession::NewL(*this ); + iHasConnection = ETrue; + PHONERINGINGTONE_PRINT("CPhoneToneServer::NewSessionL >"); + return session; + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::ThreadEntryFunc +// ----------------------------------------------------------------------------- +// +TInt CPhoneToneServer::ThreadEntryFunc( TAny* /*aPtr*/ ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::ThreadEntryFunc <"); + CTrapCleanup* cleanup = CTrapCleanup::New(); + CActiveScheduler* scheduler = new CActiveScheduler; + + // Check that all allocations were ok + if ( !cleanup || !scheduler ) + { + // Out of memory + delete scheduler; + delete cleanup; + return KErrNoMemory; + } + // Install active scheduler + CActiveScheduler::Install( scheduler ); + // Run the server + TRAPD( err, CPhoneToneServer::RunServerL() ); + // Uninstall active scheduler + CActiveScheduler::Install( NULL ); + // Cleanup + delete scheduler; + delete cleanup; + + PHONERINGINGTONE_PRINTF("CPhoneToneServer::ThreadEntryFunc - err(%d)",err); + PHONERINGINGTONE_PRINT("CPhoneToneServer::ThreadEntryFunc >"); + return err; + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::RunDown +// ----------------------------------------------------------------------------- +// +void CPhoneToneServer::RunDown() const + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::RunDown <"); + CActiveScheduler::Stop(); + PHONERINGINGTONE_PRINT("CPhoneToneServer::RunDown >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServer::RunServerL +// ----------------------------------------------------------------------------- +// +void CPhoneToneServer::RunServerL() + { + PHONERINGINGTONE_PRINT("CPhoneToneServer::RunServerL <"); + // Allocate server + CPhoneToneServer* server = CPhoneToneServer::NewLC(); + // Notify that we're running + RThread::Rendezvous( KErrNone ); + // Start active scheduler + CActiveScheduler::Start(); + CleanupStack::PopAndDestroy(); // server + PHONERINGINGTONE_PRINT("CPhoneToneServer::RunServerL >") + } + +// End of file. + diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphonetoneserverplaybackcontroller.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/src/cphonetoneserverplaybackcontroller.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,417 @@ + +/* +* Copyright (c) 2010 - 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: Playback controller class for phone ringingtone server. +* +*/ +#include +#include +#include +#include +#include +#include +#include + +#include "cphonetoneserverplaybackcontroller.h" +#include "cphonetoneserver.h" +#include "cphonetoneserversession.h" +#include "mphonetoneserver.h" +#include "phoneconstants.h" +#include "phoneringingtonetrace.h" + +const TInt KMinVolumeLevel = 1; +const TInt KMaxVolumeLevel = 10; + +#if defined( __WINS__ ) + +_LIT( KFileListRngMimeType, "rng" ); +_LIT8( KPhoneNoSoundSequence, "\x00\x11\x06\x05\xFC\x0A\x08\x40\x32\x0A\xF7\x40\x64\x06\x0B" ); + +#else + +_LIT( KFileListRngMimeType, "application/vnd.nokia.ringing-tone" ); + +#endif + +_LIT( KDefaultTone, "z:\\data\\sounds\\digital\\Nokia tune.aac" ); + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::NewL +// ----------------------------------------------------------------------------- +// +CPhoneToneServerPlaybackController* CPhoneToneServerPlaybackController::NewL() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::NewL <"); + CPhoneToneServerPlaybackController* self = + new( ELeave )CPhoneToneServerPlaybackController; + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::NewL >"); + return self; + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::ConstructL +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::ConstructL() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::ConstructL <"); + CTimer::ConstructL(); + iRingingType = EProfileRingingTypeSilent; + iSilentPlayer = CMdaAudioToneUtility::NewL( *this ); + iSilentPlayer->PrepareToPlayDesSequence( KPhoneNoSoundSequence() ); + iDefaultPlayer = CMdaAudioPlayerUtility::NewFilePlayerL( + KDefaultTone(), + *this, + KAudioPriorityPhoneCall, + static_cast< TMdaPriorityPreference >( KAudioPrefIncomingCall ) ); + + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::ConstructL >"); + } +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::CPhoneToneServerPlaybackController +// ----------------------------------------------------------------------------- +// +CPhoneToneServerPlaybackController::CPhoneToneServerPlaybackController(): + CTimer(EPriorityHigh), + iRingingType( EProfileRingingTypeSilent ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::CPhoneToneServerPlaybackController <"); + CActiveScheduler::Add(this); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::CPhoneToneServerPlaybackController <"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::~CPhoneToneServerPlaybackController +// ----------------------------------------------------------------------------- +// +CPhoneToneServerPlaybackController::~CPhoneToneServerPlaybackController() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::~CPhoneToneServerPlaybackController <"); + delete iSilentPlayer; + delete iDefaultPlayer; + delete iProfileSamplePlayer; + delete iProfileTonePlayer; + Cancel(); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::~CPhoneToneServerPlaybackController <"); + } +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::RunL +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::RunL() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::RunL <"); + StopAndDeleteProfilePlayer(); + PlayDefaultTone(); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::RunL >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::ConvertVolume +// ----------------------------------------------------------------------------- +// +TInt CPhoneToneServerPlaybackController::ConvertVolume( TInt aMaxVolume, TInt aVolume ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::ConvertVolume <"); + TInt result = aMaxVolume * aVolume / KMaxVolumeLevel; + if ( aVolume == KMinVolumeLevel && result == 0 ) + { + result = 1; + } + PHONERINGINGTONE_PRINTF("CPhoneToneServerPlaybackController::ConvertVolume - result(%d)", result); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::ConvertVolume >"); + return result; + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::PlayProfileTone +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::PlayProfileTone() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlayProfileTone <"); + if ( iProfileSamplePlayer ) + { + iProfileSamplePlayer->SetVolume( + ConvertVolume( iProfileSamplePlayer->MaxVolume(), iVolume ) ); + iProfileSamplePlayer->SetRepeats(KPhoneMdaAudioToneRepeatForever, + TTimeIntervalMicroSeconds( KPhoneRingingRepeatsTrailPause )); + iProfileSamplePlayer->Play(); + } + else if ( iProfileTonePlayer ) + { + iProfileTonePlayer->SetVolume( + ConvertVolume( iProfileTonePlayer->MaxVolume(), iVolume ) ); + iProfileTonePlayer->SetRepeats(KPhoneMdaAudioToneRepeatForever, + TTimeIntervalMicroSeconds( KPhoneRingingRepeatsTrailPause )); + iProfileTonePlayer->Play(); + } + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlayProfileTone >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::StopAndDeleteProfilePlayer +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::StopAndDeleteProfilePlayer() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::DeleteProfilePlayer() <"); + if ( iProfileSamplePlayer ) + { + iProfileSamplePlayer->Stop(); + iProfileSamplePlayer->Close(); + delete iProfileSamplePlayer; + iProfileSamplePlayer = NULL; + } + else if ( iProfileTonePlayer ) + { + if ( EMdaAudioToneUtilityPlaying == iProfileTonePlayer->State() ) + { + iProfileTonePlayer->CancelPlay(); + } + else if (EMdaAudioToneUtilityNotReady == iProfileTonePlayer->State() ) + { + iProfileTonePlayer->CancelPrepare(); + } + delete iProfileTonePlayer; + iProfileTonePlayer = NULL; + } + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::DeleteProfilePlayer() >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::IsRngL +// ----------------------------------------------------------------------------- +// +TBool CPhoneToneServerPlaybackController::IsRngL( const TDesC& aFile ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::IsRng <"); +#if defined( __WINS__ ) + + TInt index = aFile.Find( KFileListRngMimeType() ); + + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::IsRng >"); + return ( KErrNotFound != index ); + +#else + + RApaLsSession apaLsSession; + User::LeaveIfError( apaLsSession.Connect() ); + CleanupClosePushL( apaLsSession ); + TUid dummyUid = { 0 }; + TDataType dataType( dummyUid ); + User::LeaveIfError( + apaLsSession.AppForDocument( aFile, dummyUid, dataType ) ); + CleanupStack::PopAndDestroy( &apaLsSession ); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::IsRng >"); + return ( dataType.Des().CompareF( KFileListRngMimeType ) == 0 ); + +#endif + } + + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::MapcInitComplete +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::MapcInitComplete( TInt aError, + const TTimeIntervalMicroSeconds& /*aDuration*/ ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MapcInitComplete <"); + PHONERINGINGTONE_PRINTF("CPhoneToneServerPlaybackController::MapcInitComplete - aError(%d)",aError); + if ( !iDefaultPlayerInitialized && !aError ) + { + // This player will be initialized first. + iDefaultPlayerInitialized = ETrue; + iDefaultPlayer->SetRepeats(KPhoneMdaAudioToneRepeatForever, + TTimeIntervalMicroSeconds( KPhoneRingingRepeatsTrailPause )); + return; + } + // Player is initialized at startup + if ( EProfileRingingTypeSilent == iRingingType ) + { + return; + } + + // Cancel backup player timer. + Cancel(); + + if ( !aError ) + { + PlayProfileTone(); + } + else if ( iDefaultPlayerInitialized ) + { + PlayDefaultTone(); + } + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MapcInitComplete >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::MatoPrepareComplete +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::MatoPrepareComplete( TInt aError ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MatoPrepareComplete <"); + PHONERINGINGTONE_PRINTF("CPhoneToneServerPlaybackController::MatoPrepareComplete - aError(%d)",aError); + + // Player is initialized at startup + if ( EProfileRingingTypeSilent == iRingingType ) + { + return; + } + + // Cancel backup player timer. + Cancel(); + + if ( !aError ) + { + PlayProfileTone(); + } + else if ( iDefaultPlayerInitialized ) + { + PlayDefaultTone(); + } + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MatoPrepareComplete >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::MapcPlayComplete +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::MapcPlayComplete( TInt aError ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MapcPlayComplete <"); + PHONERINGINGTONE_PRINTF("CPhoneToneServerPlaybackController::MapcPlayComplete - aError(%d)",aError); +#if defined (__WINS__) + + // S^4 onwards MdaAudioPlayer returns -5 (Not Supported) + // for audio files in emulator. + // Error code is ignored to avoid unwanted situation. + if ( aError == KErrNotSupported ) + { + aError = KErrNone; + } +#endif + + if ( aError && iDefaultPlayerInitialized ) + { + PlayDefaultTone(); + } + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MapcPlayComplete >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::MatoPlayComplete +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::MatoPlayComplete( TInt aError ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MatoPlayComplete <"); + PHONERINGINGTONE_PRINTF("CPhoneToneServerPlaybackController::MatoPlayComplete - aError(%d)",aError); + if ( aError && iDefaultPlayerInitialized ) + { + PlayDefaultTone(); + } + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::MatoPlayComplete >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::PlaySilentTone +// ----------------------------------------------------------------------------- + +void CPhoneToneServerPlaybackController::PlaySilentTone() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlaySilentTone <"); + iSilentPlayer->Play(); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlaySilentTone >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerPlaybackController::PlayNormalTone +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::PlayNormalToneL( + const TFileName& aName, + TInt aVolume, + TProfileRingingType aType ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlayNormalTone <"); + PHONERINGINGTONE_PRINTF3("CPhoneToneServerPlaybackController::PlayNormalTone - aName(%S), aVolume(%d), aType(%d)",&aName, aVolume, aType ); + + iVolume = aVolume; + iRingingType = aType; + + StopAndDeleteProfilePlayer(); + Cancel(); + After( KPhoneMaxRingingWaiting ); + + if ( !aName.Length() ) + { + PlayDefaultTone(); + } + // RNG file types have to be played with CMdaAudioToneUtility player. + // Otherwise use sample player + else if ( IsRngL( aName ) ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlayNormalTone - toneplayer"); + iProfileTonePlayer = CMdaAudioToneUtility::NewL( *this ); + iProfileTonePlayer->PrepareToPlayFileSequence( aName ); + } + else + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlayNormalTone - sampleplayer"); + iProfileSamplePlayer = CMdaAudioPlayerUtility::NewFilePlayerL( + aName, + *this, + KAudioPriorityPhoneCall, + static_cast< TMdaPriorityPreference >( KAudioPrefIncomingCall )); + } + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::PlayNormalTone >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerSession::PlayDefaultTone +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::PlayDefaultTone() + { + Cancel(); + iDefaultPlayer->SetVolume( + ConvertVolume( iDefaultPlayer->MaxVolume(), iVolume ) ); + iDefaultPlayer->Play(); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerSession::StopTone +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerPlaybackController::StopTone() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::StopTone() <"); + + Cancel(); + StopAndDeleteProfilePlayer(); + + iDefaultPlayer->Stop(); + + iSilentPlayer->CancelPlay(); + PHONERINGINGTONE_PRINT("CPhoneToneServerPlaybackController::StopTone() >"); + } + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphonetoneserversession.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/src/cphonetoneserversession.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,135 @@ +/* +* Copyright (c) 2010 - 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: Phone ringing tone server session. +* +*/ + + +// INCLUDE FILES +#include +#include + +#include "phoneconstants.h" +#include "mphonetoneserver.h" +#include "cphonetoneserver.h" +#include "phoneringingtonetrace.h" +#include "cphonetoneserversession.h" +#include "cphonetoneserverplaybackcontroller.h" + + + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CPhoneToneServerSession::CPhoneToneServerSession +// ----------------------------------------------------------------------------- +// +CPhoneToneServerSession::CPhoneToneServerSession( const MPhoneToneServer& aServer ) + : iServer( aServer ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::CPhoneToneServerSession <"); + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::CPhoneToneServerSession >"); + } + + +// ----------------------------------------------------------------------------- +// CPhoneToneServerSession::~CPhoneToneServerSession +// ----------------------------------------------------------------------------- +// +CPhoneToneServerSession::~CPhoneToneServerSession() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::~CPhoneToneServerSession <"); + delete iController; + iServer.RunDown(); + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::~CPhoneToneServerSession >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerSession::NewL +// ----------------------------------------------------------------------------- +// +CPhoneToneServerSession* CPhoneToneServerSession::NewL( const MPhoneToneServer& aServer ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::NewL <"); + CPhoneToneServerSession* self = new( ELeave )CPhoneToneServerSession( aServer ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::NewL >"); + return self; + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerSession::ConstructL +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerSession::ConstructL() + { + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::ConstructL <"); + iController = CPhoneToneServerPlaybackController::NewL(); + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::ConstructL >"); + } + +// ----------------------------------------------------------------------------- +// CPhoneToneServerSession::ServiceL +// ----------------------------------------------------------------------------- +// +void CPhoneToneServerSession::ServiceL( const RMessage2& aMessage ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::ServiceL <"); + TInt volume = aMessage.Int1(); + TProfileRingingType ringingType = ( TProfileRingingType )aMessage.Int2(); + + switch ( aMessage.Function() ) + { + + //S^4 onwards supported types are + //EProfileRingingTypeRinging and EProfileRingingTypeSilent + case EPlayAudioRingTone: + { + if ( EProfileRingingTypeSilent == ringingType ) + { + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::ServiceL - EProfileRingingTypeSilent"); + iController->PlaySilentTone(); + } + else + { + TFileName filename; + if ( aMessage.GetDesLength( 0 ) < filename.MaxLength() ) + { + // Ignore error. + // Handling is done in audio playing sequence. + aMessage.Read( 0, filename ); + } + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::ServiceL - playNormalTone"); + iController->PlayNormalToneL( filename, volume, ringingType ); + } + } + break; + + case EStopPlaying: + { + iController->StopTone(); + } + break; + + default: + break; + } + + aMessage.Complete( KErrNone ); + PHONERINGINGTONE_PRINT("CPhoneToneServerSession::ServiceL >"); + } + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/cphonettsplayer.cpp --- a/phoneapp/phoneringingtoneplayer/src/cphonettsplayer.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,502 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include "cphonettsplayer.h" -#include "cphoneringingtone.h" -#include "cphoneringingtoneplayer.h" -#include "phonelogger.h" -#include - -CPhoneTTSPlayer::CPhoneTTSPlayer(CPhoneRingingtonePlayer* aRingingtonePlayer): -iRingingtonePlayer (aRingingtonePlayer) - { - - - } - -CPhoneTTSPlayer::~CPhoneTTSPlayer() - { - delete iTtsDelayTimer; - delete iTtsPlayer; - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CPhoneTTSPlayer* CPhoneTTSPlayer::NewL(CPhoneRingingtonePlayer* aRingingtonePlayer) - { - CPhoneTTSPlayer* self = - new ( ELeave ) CPhoneTTSPlayer(aRingingtonePlayer); - - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::ConstructL() - { - iTtsDelayTimer = CPhoneTimer::NewL(); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::PlayTtsTone( - const TDesC& aTextToSay, - CPhoneRingingTone* aAudioVideoRingingTone ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::PlayTtsTone()" ); - //__PHONELOG2( EBasic, EPhoneControl, "CPhoneTTSPlayer::PlayTtsTone - aVolume(%d), aRingingType(%d)", - // aVolume, aRingingType ); - - if ( iTtsPlayer ) - { - delete iTtsPlayer; - iTtsPlayer = NULL; - } - - //Set ringingtype for Tts. - iTtsRingingType = aAudioVideoRingingTone->RingingType(); - iTtsVolume = aAudioVideoRingingTone->Volume(); - - // TTS should be a bit louder, than main component. - // No need to check for overflows, they are handled in SET_PHONE_VOLUME macro. - - TPtrC ttsHeader( KPhoneTtsHeader ); - HBufC* preparedString = - HBufC::New( aTextToSay.Length() + ttsHeader.Length() ); - - if ( preparedString ) - { - TPtr pPreparedString = preparedString->Des(); - pPreparedString.Append( ttsHeader ); - pPreparedString.Append( aTextToSay ); - - __PHONELOG1( - EBasic, - EPhoneControl, - "CPhoneTTSPlayer::PlayTtsTone - about to say %S", - &pPreparedString ); - - TRAPD( - error, - iTtsPlayer = CPhoneAudioPlayer::NewTtsL( - *preparedString, - KAudioPriorityPhoneCall, - KAudioPrefTextToSpeechCallHardCoded, - *this, - CPhoneRingingtonePlayer::EPlayerTts ) ); - if( error == KErrNone ) - { - // To be played when default or personal tone will be played - iTtsToneToBePlayed = ETrue; - } - __PHONELOG2( - EBasic, - EPhoneControl, - "CPhoneTTSPlayer::PlayTtsTone - error(%d), iTtsPhoneToBePlayed(%d)", - error, - iTtsToneToBePlayed ); - - delete preparedString; - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::StopPlaying() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::StopPlaying()" ); - - iTtsToneToBePlayed = EFalse; - iTTsTimeOutCounter = 0; - iTtsDelayTimer->Cancel(); - if ( iTtsPlayer ) - { - iTtsPlayer->StopPlaying(); - delete iTtsPlayer; - iTtsPlayer = NULL; - } - } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::HandleAudioPlayerError( - TPhoneAudioPlayerErrorEvent /*aEvent*/, - TInt /*aError*/, - TInt /*aId*/ ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::HandleAudioPlayerError()" ); - - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::HandleAudioPlayerInitComplete( TInt /*aId*/ ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::HandleAudioPlayerInitComplete()" ); - // This is called from CPhoneAudioPlayer - we do not - // want to delete instances from which this method - // is called. - - if( iTtsToneToBePlayed ) - { - // Start TTS timer just before "normal ringtone component" starts - // playing, i.e. after init completed. - if ( iTtsDelayIndex < iTtsDelaysCount ) - { - if ( !iTtsDelayTimer->IsActive() ) - { - // There are TTS iterations to be played yet. - iTtsDelayTimer->After( - KPhoneTtsDelays[iTtsDelayIndex], - TCallBack( HandleTtsDelayTimeout, this ) ); - } - } - } - } - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::HandlePlayingComplete -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::HandlePlayingComplete( TInt aId ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::HandlePlayingComplete()" ); - // This is called from CPhoneAudioPlayer - we do not - // want to delete instances from which this method - // is called. - - /* __PHONELOG2( - EBasic, - EPhoneControl, - "CPhoneTTSPlayer::HandlePlayingComplete - aId(%d), iRingingType(%d)", - aId, - iRingingType );*/ - __PHONELOG2( - EBasic, - EPhoneControl, - "CPhoneTTSPlayer::HandlePlayingComplete - iTtsToneToBePlayed(%d), iTtsDelayIndex(%d)", - iTtsToneToBePlayed, - iTtsDelayIndex ); - - if ( aId == CPhoneRingingtonePlayer::EPlayerTts ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::HandlePlayingComplete - resuming after TTS" ); - - // TTS playing complete, normal tone player should volume up. - if ( ( iTtsToneToBePlayed ) && ( ++iTtsDelayIndex < iTtsDelaysCount ) ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::HandlePlayingComplete - resuming after TTS first time" ); - //Callers name is said once. increase tone player volume. - SolveNewVolumeAndRamptime( ESaidOnce ); - - if ( !iTtsDelayTimer->IsActive() ) - { - // There are TTS iterations to be played yet. - iTtsDelayTimer->After( KPhoneTtsDelays[iTtsDelayIndex], - TCallBack( HandleTtsDelayTimeout,this ) ); - } - } - else - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::HandlePlayingComplete - resuming after TTS second time" ); - SolveNewVolumeAndRamptime( ESaidTwice ); - } - - // No further processing. All TTS player-related events are not - // "real" ringtone playing completions. - return; - } - //Case: RingintonePlayer has completed playing with following set: ring once and - // TTS is activated - if ( iTtsRingingType == EProfileRingingTypeRingingOnce && - iTtsToneToBePlayed ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::HandlePlayingComplete - ring once and TTS" ); - if ( iTtsDelayIndex < iTtsDelaysCount ) - { - ReStartRingingTonePlayer(); - //Do not destroy player yet. Return. - return; - } - } - //Case: RingintonePlayer has completed playing with following set: ringing - //and TTS is activated. We need to restart ringintoneplayer and new TTS - //iterations are required. - else if ( iTtsRingingType == EProfileRingingTypeRinging && iTtsToneToBePlayed ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::HandlePlayingComplete - ringing and TTS" ); - if ( iTtsDelayIndex == iTtsDelaysCount ) - { - //Case: Ringingtype is EProfileRingingTypeRinging. New TTS - //iterations are required. - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::HandlePlayingComplete - need to restart TTS sequence" ); - //TTS has completed its iterations,set index to zero. - iTtsDelayIndex = 0; - if ( !iTtsDelayTimer->IsActive() ) - { - //Restart TTS sequence - iTtsDelayTimer->After( - KPhoneTtsDelays[iTtsDelayIndex], - TCallBack( HandleTtsDelayTimeout, this ) ); - } - } - - ReStartRingingTonePlayer(); - //Do not destroy player yet. Return - return; - } - } - - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -TInt CPhoneTTSPlayer::HandleTtsDelayTimeout( TAny* object ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::HandleTtsDelayTimeout()" ); - static_cast( object )-> - DoHandleTtsDelayTimeout(); - return KErrNone; - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::DoHandleTtsDelayTimeout() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::DoHandleTtsDelayTimeout()" ); - __PHONELOG2( EBasic, EPhoneControl, "CPhoneTTSPlayer::DoHandleTtsDelayTimeout - iTtsRingingType(%d), iTTsTimeOutCounter(%d)", - iTtsRingingType, iTTsTimeOutCounter ); - - CPhoneAudioPlayer* currPlayer = NULL; - currPlayer = GetCurrentlyActiveAudioPlayerWithTTs(); - - if ( !currPlayer ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::DoHandleTtsDelayTimeout - null current player" ); - return; - } - TInt volume( 0 ); - //Ascending case. TTs player needs to be ascending. - if ( iTtsRingingType == EProfileRingingTypeAscending ) - { - //Volume needs to be different in different ascending steps - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::DoHandleTtsDelayTimeout - play ascending" ); - if ( !iTTsTimeOutCounter ) - { - //We are saying callers name for the first time in ascending mode. - //Say callers name by volume level KTtsVolumeMin. - volume = KTtsVolumeMin; - - iTtsPlayer->Play( - ConvertRingingType( EProfileRingingTypeRingingOnce ), - volume, - iTtsToneToBePlayed ); - } - else - { - //Checks the case that ringingtone is very quiet. Then do not play - //TTS too loud - volume = iTtsVolume < KTtsVolumeMin ? KTtsVolumeMin : KTtsVolumeAscendingRepeat; - - //We are saying callers name for the second time in ascending mode. - //Say callers name by volume level KTtsVolumeAscendingRepeat and decrease current players volume - //to KPlayerVolumeAscendingRepeat. RampTime is zero - currPlayer->SetNewVolumeAndRamptime( KPlayerVolumeAscendingRepeat, 0 ); - iTtsPlayer->Play( - ConvertRingingType( EProfileRingingTypeRingingOnce ), - volume, - iTtsToneToBePlayed ); - } - - } - else //Normal ringing case. - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::DoHandleTtsDelayTimeout - play normal" ); - currPlayer->SetNewVolumeAndRamptime( iTtsVolume-5, 0 ); - iTtsPlayer->Play( - ConvertRingingType( EProfileRingingTypeRingingOnce ), - iTtsVolume, - iTtsToneToBePlayed ); - } - - iTTsTimeOutCounter++; - } - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::AddTtsPlaybackIfNeeded -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::AddTtsPlaybackIfNeeded() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::AddTtsPlaybackIfNeeded()" ); - if ( iTtsToneToBePlayed ) - { - iTtsDelayIndex = 0; - iTtsDelaysCount = KPhoneTtsDelaysCount; - } - } - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::SolveNewVolumeAndRamptime -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::SolveNewVolumeAndRamptime( TTtsStatus aStatus ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::SolveNewVolumeAndRamptime()" ); - - CPhoneAudioPlayer* currPlayer = NULL; - currPlayer = GetCurrentlyActiveAudioPlayerWithTTs(); - if ( !currPlayer ) - { - __PHONELOG( EBasic, EPhoneControl, "CPhoneTTSPlayer::SolveNewVolumeAndRamptime - null current player" ); - return; - } - TInt ramptime( 0 ); - //Here is handled the cases when Callers name is said. Sequence is: - //3 sec. tone + name + 4 sec. tone + name +the tone until the end. - switch ( aStatus ) - { - case ESaidOnce: - if ( iTtsRingingType == EProfileRingingTypeAscending ) - { - //The ramptime could be ( 4 )* KPhoneTtsAscendingStep but now - //we are setting this to 0 because when Say callers name is said - //for first time: play ringing tone on level 3 for four secs. - ramptime = 0; - __PHONELOG1( EBasic, EPhoneControl, "CPhoneTTSPlayer::SolveNewVolumeAndRamptime - said once ascending - ramptime(%d)", - ramptime ); - currPlayer->SetNewVolumeAndRamptime( KPlayerVolumeAscendingRepeat, ramptime ); - } - else - { - //Normal ringingtone case. Adjust volume back to profile level. - __PHONELOG1( EBasic, EPhoneControl, "CPhoneTTSPlayer::SolveNewVolumeAndRamptime - said once normal - ramptime(%d)", - ramptime ); - currPlayer->SetNewVolumeAndRamptime( iTtsVolume, 0 ); - } - break; - - case ESaidTwice: - if ( iTtsRingingType == EProfileRingingTypeAscending ) - { - TInt vol = iTtsVolume; - if ( vol > KPlayerVolumeAscendingRepeat ) - { - vol = vol - KTtsVolumeAscendingDecrease; - } - - //TTS playing complete for second time. increase tone player volume. - ramptime = ( vol )*KPhoneTtsAscendingStep; - __PHONELOG1( EBasic, EPhoneControl, "CPhoneTTSPlayer::SolveNewVolumeAndRamptime - said twice ascending - ramptime(%d)", - ramptime ); - currPlayer->SetNewVolumeAndRamptime( iTtsVolume, ramptime ); - } - else - { - //Normal ringingtone case. Adjust volume back to profile level. - __PHONELOG1( EBasic, EPhoneControl, "CPhoneTTSPlayer::SolveNewVolumeAndRamptime - said twice normal - ramptime(%d)", - ramptime ); - currPlayer->SetNewVolumeAndRamptime( iTtsVolume, 0 ); - } - break; - - default: - break; - } - } - - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer* -CPhoneTTSPlayer::GetCurrentlyActiveAudioPlayerWithTTs() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::GetCurrentlyActiveAudioPlayerWithTTs()" ); - - return iRingingtonePlayer->GetCurrentlyActiveAudioPlayer(); - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::ReStartRingingTonePlayer() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::ReStartRingingTonePlayer()" ); - - //First get currently active player which plays among TTS player. - CPhoneAudioPlayer* currPlayer = NULL; - currPlayer = GetCurrentlyActiveAudioPlayerWithTTs(); - if ( currPlayer ) - { - currPlayer->ReStartPlaying(); - } - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer::TRingingType CPhoneTTSPlayer::ConvertRingingType( - TProfileRingingType aRingingType ) - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneTTSPlayer::ConvertRingingType()" ); - - CPhoneAudioPlayer::TRingingType ringingType = - CPhoneAudioPlayer::ETypeRinging; - switch ( aRingingType ) - { - case EProfileRingingTypeRinging: - ringingType = CPhoneAudioPlayer::ETypeRinging; - break; - - case EProfileRingingTypeAscending: - ringingType = CPhoneAudioPlayer::ETypeAscending; - break; - - case EProfileRingingTypeRingingOnce: - ringingType = CPhoneAudioPlayer::ETypeRingingOnce; - break; - - default: - break; - } - return ringingType; - } - - - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/src/rphonetoneclient.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/src/rphonetoneclient.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,162 @@ +/* +* Copyright (c) 2002-2005,2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Client interface of the phone ringing tone server. +* +*/ + + +// INCLUDE FILES +#include +#include +#include + +#include "rphonetoneclient.h" +#include "cphonetoneserver.h" +#include "tphonecmdparamringtone.h" +#include "phoneringingtonetrace.h" + +// LOCAL FUNCTION PROTOTYPES +static TInt StartServer(); + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::RPhoneToneClient +// ----------------------------------------------------------------------------- +// +EXPORT_C RPhoneToneClient::RPhoneToneClient() : RSessionBase() + { + } + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::~RPhoneToneClient +// ----------------------------------------------------------------------------- +// +EXPORT_C RPhoneToneClient::~RPhoneToneClient() + { + Close(); + } + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::Connect +// ----------------------------------------------------------------------------- +// +EXPORT_C TInt RPhoneToneClient::Connect() + { + PHONERINGINGTONE_PRINT("RPhoneToneClient::Connect <"); + + TBool reConnect( EFalse ); + + TInt err = CreateSession( KRingingToneServerName, + TVersion( KRingingToneSrvVersionMajor, + KRingingToneSrvVersionMinor, + KRingingToneSrvVersionBuild ) ); + + if ( KErrNotFound == err ) + { + err = StartServer(); + + if ( !err ) + { + reConnect = ETrue; + } + } + + if ( reConnect ) + { + err = CreateSession( KRingingToneServerName, + TVersion( KRingingToneSrvVersionMajor, + KRingingToneSrvVersionMinor, + KRingingToneSrvVersionBuild ) ); + } + + PHONERINGINGTONE_PRINTF("RPhoneToneClient::Connect - err(%d)", err); + PHONERINGINGTONE_PRINT("RPhoneToneClient::Connect >"); + return err; + + } + +// ----------------------------------------------------------------------------- +// StartServer +// ----------------------------------------------------------------------------- +// +TInt StartServer() + { + PHONERINGINGTONE_PRINT("RPhoneToneClient - StartServer <"); + // Form thread name + TTime time; + time.UniversalTime(); + + TFullName threadName; + threadName.Format( _L("PhoneRingingToneThread%Ld"), time.Int64() ); + + // Create thread + RThread thread; + TInt err = thread.Create( threadName, + CPhoneToneServer::ThreadEntryFunc, + 0x8000, + NULL, + NULL ); + + PHONERINGINGTONE_PRINTF("RPhoneToneClient - StartServer - err(%d)", err); + if ( err ) + { + thread.Close(); + return err; + } + + thread.SetPriority( EPriorityAbsoluteHigh ); + TRequestStatus status; + thread.Rendezvous( status ); + + thread.Resume(); + + // Wait for thread start or death + User::WaitForRequest( status ); + thread.Close(); + PHONERINGINGTONE_PRINT("RPhoneToneClient - StartServer >"); + return status.Int(); + } + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::PlayRingingToneL +// ----------------------------------------------------------------------------- +// +EXPORT_C void RPhoneToneClient::PlayRingingToneL( TPhoneCommandParam *aCommandParam ) + { + PHONERINGINGTONE_PRINT("RPhoneToneClient::PlayRingingToneL <"); + + if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdRingTone ) + { + TPhoneCmdParamRingTone* ringToneParam = + static_cast( aCommandParam ); + + TIpcArgs args( &( ringToneParam->RingTone() ), + ringToneParam->Volume(), + ringToneParam->RingingType() ); + User::LeaveIfError( SendReceive( EPlayAudioRingTone, args ) ); + } + PHONERINGINGTONE_PRINT("RPhoneToneClient::PlayRingingToneL >"); + } + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::StopPlaying +// ----------------------------------------------------------------------------- +// +EXPORT_C void RPhoneToneClient::StopPlayingL() + { + PHONERINGINGTONE_PRINT("RPhoneToneClient::StopPlayingL <"); + User::LeaveIfError( SendReceive( EStopPlaying ) ); + PHONERINGINGTONE_PRINT("RPhoneToneClient::StopPlayingL >"); + } + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/bwins/mt_phoneringingtoneplayeru.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/bwins/mt_phoneringingtoneplayeru.def Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,2 @@ +EXPORTS + ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void) \ No newline at end of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/group/bld.inf Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,34 @@ +/* +* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + +#include + +PRJ_PLATFORMS + WINSCW + +PRJ_EXPORTS + +// IBY file +//../rom/mt_phoneringingtoneplayer.iby CORE_APP_LAYER_IBY_EXPORT_PATH(mt_phoneringingtoneplayer.iby) + +PRJ_MMPFILES + +PRJ_TESTMMPFILES +mt_phoneringingtoneplayer.mmp + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/group/mt_phoneringingtoneplayer.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/group/mt_phoneringingtoneplayer.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,59 @@ +/* +* Copyright (c) 2010-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: MT_phoneringingtoneplayer +* +*/ + + +#include +#include + +TARGET mt_phoneringingtoneplayer.dll +TARGETTYPE dll +TARGETPATH /DigiaEUnit/Tests +UID 0x1000af5a 0x01700000 + +CAPABILITY EUNIT_CAPS +VENDORID VID_DEFAULT + +SOURCEPATH ../src +SOURCE devsoundstub.cpp +SOURCE mt_phoneringingtoneplayermain.cpp +SOURCE mt_phoneringingtoneplayer.cpp + +SOURCEPATH ../../../src +SOURCE cphonetoneserver.cpp +SOURCE rphonetoneclient.cpp +SOURCE cphonetoneserversession.cpp +SOURCE cphonetoneserverplaybackcontroller.cpp +SOURCEPATH ../../../../phoneuiutils/src/ +SOURCE tphonecommandparam.cpp +SOURCE tphonecmdparamringtone.cpp + +USERINCLUDE ../../../inc +USERINCLUDE ../../../../phoneuiutils/inc +USERINCLUDE ../src +USERINCLUDE ../../../../phoneui2/srcdata + +APP_LAYER_SYSTEMINCLUDE +SYSTEMINCLUDE ../../../../../inc +SYSTEMINCLUDE /epoc32/include/Digia/EUnit + + +LIBRARY EUnit.lib +LIBRARY EUnitUtil.lib +LIBRARY euser.lib + + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/group/mt_phoneringingtoneplayer.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/group/mt_phoneringingtoneplayer.pkg Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,33 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: For packing sssettings test compoment. +; +; Supported languages +&en + +; Package header (one name for each supported language) +#{"MT_SSSettings"},(0xA00001F2),1,0,0 + +;Localised Vendor name +%{"Nokia Test EN"} + +;Unique Vendor name +:"Vendor" + +;Key and certificate +*"rd-key.pem","rd.cer" + +; Language independent files that are always installed +"\epoc32\release\armv5\urel\mt_phoneringingtoneplayer.dll"-"C:\DigiaEUnit\Tests\mt_phoneringingtoneplayer.dll" +"\epoc32\release\armv5\urel\mt_phoneringingtoneplayer.dll"-"C:\sys\bin\mt_phoneringingtoneplayer.dll" diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/devsoundstub.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/devsoundstub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,864 @@ + +#include "devsoundstub.h" + +RPointerArray< CTestFunctionCallData > CMdaAudioPlayerUtility::iStaticTestData; + +RPointerArray< CTestFunctionCallData > CMdaAudioToneUtility::iStaticTestData; + +bool CMdaAudioPlayerUtility::iDelayedAudioLoading = EFalse; + +bool CMdaAudioPlayerUtility::iErrorInAudioLoading = EFalse; + +bool CMdaAudioToneUtility::iDelayedAudioLoading = EFalse; + +bool CMdaAudioToneUtility::iErrorInAudioLoading = EFalse; + +const TTimeIntervalMicroSeconds32 KNormalLoadingTime = TTimeIntervalMicroSeconds32( 1500000 ); +const TTimeIntervalMicroSeconds32 KDelayedLoadingTime = TTimeIntervalMicroSeconds32( 4000000 ); + +const static TInt KGeneratedError = KErrNotFound; + + +// ----------------------------------------------------------------------------- +// CMdaServer::NewL() +// ----------------------------------------------------------------------------- +// +CMdaServer* CMdaServer::NewL() + { + return new( ELeave )CMdaServer; + } + +// ----------------------------------------------------------------------------- +// CMdaServer::~CMdaServer() +// ----------------------------------------------------------------------------- +// +CMdaServer::~CMdaServer() + { + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::NewL +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData* CTestFunctionCallData::NewL( TInt aFunctionIndex, HBufC* aString, TInt aInt1, TInt aInt2 ) + { + return new( ELeave )CTestFunctionCallData( aFunctionIndex, aString, aInt1, aInt2, TTimeIntervalMicroSeconds( 0 ) ); + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::NewL +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData* CTestFunctionCallData::NewL( TInt aFunctionIndex, TInt aInt1, TInt aInt2 ) + { + return new( ELeave )CTestFunctionCallData( aFunctionIndex, NULL, aInt1, aInt2, TTimeIntervalMicroSeconds( 0 ) ); + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::NewL +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData* CTestFunctionCallData::NewL( TInt aFunctionIndex, TInt aInt1 ) + { + return new( ELeave )CTestFunctionCallData( aFunctionIndex, NULL, aInt1, 0, TTimeIntervalMicroSeconds( 0 ) ); + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::NewL +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData* CTestFunctionCallData::NewL( TInt aFunctionIndex, TInt aInt1, TTimeIntervalMicroSeconds aSeconds ) + { + return new( ELeave )CTestFunctionCallData( aFunctionIndex, NULL, aInt1, 0, aSeconds ); + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::NewL +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData* CTestFunctionCallData::NewL( TInt aFunctionIndex, TTimeIntervalMicroSeconds aSeconds ) + { + return new( ELeave )CTestFunctionCallData( aFunctionIndex, NULL, 0, 0, aSeconds ); + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::NewL +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData* CTestFunctionCallData::NewL( TInt aFunctionIndex, HBufC8* aString ) + { + return new( ELeave )CTestFunctionCallData( aFunctionIndex, aString ); + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::~CTestFunctionCallData() +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData::~CTestFunctionCallData() + { + delete iP1; + delete iP5; + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::CTestFunctionCallData +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData::CTestFunctionCallData( TInt aFunctionIndex, HBufC* aPtr1, TInt aInt1, TInt aInt2, TTimeIntervalMicroSeconds aSeconds ) : + iFunctionIndex( aFunctionIndex ), + iP1( aPtr1 ), + iP2( aInt1 ), + iP3( aInt2 ), + iP4( aSeconds ) + { + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::CTestFunctionCallData +// ----------------------------------------------------------------------------- +// +CTestFunctionCallData::CTestFunctionCallData( TInt aFunctionIndex, HBufC8* aString ) : iFunctionIndex( aFunctionIndex ), + iP5( aString ) + { + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::DesC1() +// ----------------------------------------------------------------------------- +// +HBufC* CTestFunctionCallData::DesC1() + { + return iP1; + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::DesC2() +// ----------------------------------------------------------------------------- +// +HBufC8* CTestFunctionCallData::DesC2() + { + return iP5; + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::Int1() +// ----------------------------------------------------------------------------- +// +TInt CTestFunctionCallData::Int1() + { + return iP2; + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::Int2() +// ----------------------------------------------------------------------------- +// +TInt CTestFunctionCallData::Int2() + { + return iP3; + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::Seconds() +// ----------------------------------------------------------------------------- +// +TTimeIntervalMicroSeconds CTestFunctionCallData::Seconds() + { + return iP4; + } + +// ----------------------------------------------------------------------------- +// CTestFunctionCallData::FunctionIndex() +// ----------------------------------------------------------------------------- +// +TInt CTestFunctionCallData::FunctionIndex() + { + return iFunctionIndex; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::NewFilePlayerL +// ----------------------------------------------------------------------------- +// +TBool CTestFunctionCallData::operator ==( CTestFunctionCallData& aData ) + { + TBool equals( ETrue ); + + if ( aData.FunctionIndex() != iFunctionIndex ) + { + equals = EFalse; + } + else if ( iP1 && !aData.DesC1() ) + { + equals = EFalse; + } + else if ( !iP1 && aData.DesC1() ) + { + equals = EFalse; + } + else if ( iP1 && aData.DesC1() && iP1->Des().Compare( *aData.DesC1() ) ) + { + equals = EFalse; + } + else if ( iP5 && !aData.DesC2() ) + { + equals = EFalse; + } + else if (!iP5 && aData.DesC2() ) + { + equals = EFalse; + } + else if ( iP5 && aData.DesC2() && iP5->Des().Compare( *aData.DesC2() ) ) + { + equals = EFalse; + } + else if ( iP2 != aData.Int1() ) + { + equals = EFalse; + } + else if ( iP3 != aData.Int2() ) + { + equals = EFalse; + } + else if ( iP4 != aData.Seconds() ) + { + equals = EFalse; + } + return equals; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::NewFilePlayerL +// ----------------------------------------------------------------------------- +// +CMdaAudioPlayerUtility* CMdaAudioPlayerUtility::NewFilePlayerL(const TDesC& aFileName, + MMdaAudioPlayerCallback& aCallback, + TInt aPriority, + TInt aPref, + CMdaServer* aServer ) + { + HBufC* desc = HBufC::NewL( aFileName.Length() ); + *desc = aFileName; + CleanupStack::PushL( desc ); + CTestFunctionCallData* data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::ENewFilePlayerL, desc, aPriority, aPref ); + CleanupStack::Pop( desc ); + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + CMdaAudioPlayerUtility* self = new( ELeave )CMdaAudioPlayerUtility( aCallback, aPriority, aPref, aServer ); + self->ConstructL( aFileName ); + return self; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::NewL +// ----------------------------------------------------------------------------- +// +CMdaAudioPlayerUtility* CMdaAudioPlayerUtility::NewL( MMdaAudioPlayerCallback& aCallback, + TInt aPriority, + TInt aPref ) + { + CTestFunctionCallData* data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::ENewL, aPriority, aPref ); + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + CMdaAudioPlayerUtility* self = new( ELeave )CMdaAudioPlayerUtility( aCallback, aPriority, aPref, NULL ); + return self; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::CMdaAudioPlayerUtility +// ----------------------------------------------------------------------------- +// +CMdaAudioPlayerUtility::CMdaAudioPlayerUtility( MMdaAudioPlayerCallback& aObserver, TInt aPriority, TInt aPref, CMdaServer* aServer ) : + CActive( EPriorityStandard ), + iObserver( aObserver ), + iMaxVolume( 10 ), + iVolume( 5 ), + iPriority( aPriority ), + iPref( aPref ), + iServer( aServer ) + { + CActiveScheduler::Add( this ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::~CMdaAudioPlayerUtility() +// ----------------------------------------------------------------------------- +// +CMdaAudioPlayerUtility::~CMdaAudioPlayerUtility() + { + //iTimer.Cancel(); + Cancel(); + iTimer.Close(); + delete iFile; + delete iFile8; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::SetVolume +// ----------------------------------------------------------------------------- +// +TInt CMdaAudioPlayerUtility::SetVolume(TInt aVolume) + { + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::ESetVolume, aVolume ) ); + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::SetRepeats +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::SetRepeats(TInt aRepeatNumberOfTimes, const TTimeIntervalMicroSeconds& aTrailingSilence ) + { + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::ESetRepeats, aRepeatNumberOfTimes, aTrailingSilence ) ); + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::SetVolumeRamp +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::SetVolumeRamp(const TTimeIntervalMicroSeconds& aRampDuration) + { + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::ESetVolumeRamp, aRampDuration ) ); + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::MaxVolume() +// ----------------------------------------------------------------------------- +// +TInt CMdaAudioPlayerUtility::MaxVolume() + { + return iMaxVolume; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::GetVolume +// ----------------------------------------------------------------------------- +// +TInt CMdaAudioPlayerUtility::GetVolume(TInt& aVolume) + { + aVolume = iVolume; + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::OpenDesL +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::OpenDesL(const TDesC8& aDescriptor) + { + HBufC8* desc = HBufC8::NewL( aDescriptor.Length() ); + *desc = aDescriptor; + CleanupStack::PushL( desc ); + CTestFunctionCallData* data = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EOpenDesL, desc ); + CleanupStack::Pop( desc ); + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + ConstructL( aDescriptor ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::DoCancel() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::DoCancel() + { + iTimer.Cancel(); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::RunL() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::RunL() + { + + TTimeIntervalMicroSeconds s( 0 ); + if ( CMdaAudioPlayerUtility::iErrorInAudioLoading ) + { + iObserver.MapcInitComplete( KGeneratedError, s ); + } + else + { + iObserver.MapcInitComplete( KErrNone, s ); + } + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::DelayAudioLoading() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::DelayAudioLoading() + { + CMdaAudioPlayerUtility::iDelayedAudioLoading = ETrue; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::SimulateErrorInAudioLoading() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::SimulateErrorInAudioLoading() + { + CMdaAudioPlayerUtility::iErrorInAudioLoading = ETrue; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::TestData() +// ----------------------------------------------------------------------------- +// +RPointerArray< CTestFunctionCallData >& CMdaAudioPlayerUtility::TestData() + { + return CMdaAudioPlayerUtility::iStaticTestData; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::ResetTestData() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::ResetTestData() + { + CMdaAudioPlayerUtility::iStaticTestData.ResetAndDestroy(); + CMdaAudioPlayerUtility::iDelayedAudioLoading = EFalse; + CMdaAudioPlayerUtility::iErrorInAudioLoading = EFalse; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::ConstructL() +// ----------------------------------------------------------------------------- +// + void CMdaAudioPlayerUtility::ConstructL( const TDesC& aFileName ) + { + iTimer.CreateLocal(); + + if ( CMdaAudioPlayerUtility::iDelayedAudioLoading ) + { + iTimer.After( iStatus, KDelayedLoadingTime ); + } + else + { + iTimer.After( iStatus, KNormalLoadingTime ); + } + SetActive(); + + delete iFile; + iFile = NULL; + + iFile = HBufC::NewL( aFileName.Length() ); + *iFile = aFileName; + } + +void CMdaAudioPlayerUtility::ConstructL( const TDesC8& aFileName ) + { + iTimer.CreateLocal(); + if ( CMdaAudioPlayerUtility::iDelayedAudioLoading ) + { + iTimer.After( iStatus, KDelayedLoadingTime ); + } + else + { + iTimer.After( iStatus, KNormalLoadingTime ); + } + SetActive(); + + delete iFile8; + iFile8 = NULL; + + iFile8 = HBufC8::NewL( aFileName.Length() ); + *iFile8 = aFileName; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::Play() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::Play() + { + CTestFunctionCallData* data( NULL ); + if ( iFile ) + { + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::EPlay, iFile, 0, 0 ) ); + iFile = NULL; + } + else if ( iFile8 ) + { + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::EPlay, iFile8 ) ); + iFile8 = NULL; + } + else + { + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::EPlay ) ); + } + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::Stop() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::Stop() + { + CTestFunctionCallData* data = CTestFunctionCallData::NewL( CMdaAudioPlayerUtility::EStop ); + CMdaAudioPlayerUtility::iStaticTestData.Append( data ); + } + + +// ----------------------------------------------------------------------------- +// CMdaAudioPlayerUtility::Close() +// ----------------------------------------------------------------------------- +// +void CMdaAudioPlayerUtility::Close() + { + + } + + + +//*************************************** +/* +** +** +** CMdaAudioToneUtility +** +** +** +*****************************************/ + + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::NewL +// ----------------------------------------------------------------------------- +// +/* +CMdaAudioToneUtility* CMdaAudioToneUtility::NewL(MMdaAudioToneObserver& aObserver, CMdaServer* aServer ) + { + CTestFunctionCallData* data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::ENewL ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + CMdaAudioToneUtility* self = new( ELeave )CMdaAudioToneUtility( aObserver, 0, 0, aServer ); + return self; + } +*/ +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::NewL +// ----------------------------------------------------------------------------- +// +CMdaAudioToneUtility* CMdaAudioToneUtility::NewL(MMdaAudioToneObserver& aObserver, CMdaServer* aServer, + TInt aPriority, + TInt aPref ) + { + CTestFunctionCallData* data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::ENewL, aPriority, aPref ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + CMdaAudioToneUtility* self = new( ELeave )CMdaAudioToneUtility( aObserver, aPriority, aPref, aServer ); + return self; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::CMdaAudioToneUtility +// ----------------------------------------------------------------------------- +// +CMdaAudioToneUtility::CMdaAudioToneUtility( MMdaAudioToneObserver& aObserver, TInt aPriority, TInt aPref, CMdaServer* aServer ) : + CActive( EPriorityStandard ), + iObserver( aObserver ), + iPriority( aPriority ), + iPref( aPref ), + iServer( aServer ) + { + CActiveScheduler::Add( this ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::~CMdaAudioToneUtility() +// ----------------------------------------------------------------------------- +// +CMdaAudioToneUtility::~CMdaAudioToneUtility() + { + //iTimer.Cancel(); + Cancel(); + iTimer.Close(); + delete iFile8; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::MaxVolume() +// ----------------------------------------------------------------------------- +// +TInt CMdaAudioToneUtility::MaxVolume() + { + return iMaxVolume; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::Volume() +// ----------------------------------------------------------------------------- +// +TInt CMdaAudioToneUtility::Volume() + { + return iVolume; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::SetVolume +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::SetVolume( TInt aVolume ) + { + iVolume = aVolume; + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::ESetVolume, aVolume ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::SetRepeats +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::SetRepeats( TInt aRepeatNumberOfTimes, const TTimeIntervalMicroSeconds& aTrailingSilence ) + { + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::ESetRepeats, aRepeatNumberOfTimes, aTrailingSilence ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::SetVolumeRamp +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::SetVolumeRamp( const TTimeIntervalMicroSeconds& aRampDuration ) + { + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::ESetVolumeRamp, aRampDuration ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::FixedSequenceCount() +// ----------------------------------------------------------------------------- +// +TInt CMdaAudioToneUtility::FixedSequenceCount() + { + return 0; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::FixedSequenceName +// ----------------------------------------------------------------------------- +// +const TDesC& CMdaAudioToneUtility::FixedSequenceName( TInt /*aSequenceNumber*/ ) + { + return KNullDesC(); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::PrepareToPlayTone +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::PrepareToPlayTone( TInt /*aFrequency*/, const TTimeIntervalMicroSeconds& /*aDuration*/ ) + { + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::PrepareToPlayDTMFString +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::PrepareToPlayDTMFString( const TDesC& /*aDTMF*/ ) + { + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::PrepareToPlayDesSequence +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::PrepareToPlayDesSequence( const TDesC8& aSequence ) + { + HBufC8* des( NULL ); + TRAP_IGNORE( des = HBufC8::NewL( aSequence.Length() ) ); + TRAP_IGNORE( iFile8 = HBufC8::NewL( aSequence.Length() ) ); + + CTestFunctionCallData* data( NULL ); + if ( des ) + { + *des = aSequence; + } + + if ( iFile8 ) + { + *iFile8 = aSequence; + } + + TRAP_IGNORE( data = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::EPrepareToPlayDesSequence, des ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::PrepareToPlayFileSequence +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::PrepareToPlayFileSequence( const TDesC& aFileName ) + { + HBufC* desc = HBufC::NewL( aFileName.Length() ); + *desc = aFileName; + CleanupStack::PushL( desc ); + CTestFunctionCallData* data( NULL ); + data = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::EPrepareToPlayFileSequence, desc, 0, 0 ); + CleanupStack::Pop( desc ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + ConstructL(); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::PrepareToPlayFixedSequence +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::PrepareToPlayFixedSequence( TInt /*aSequenceNumber*/ ) + { + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::CancelPrepare() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::CancelPrepare() + { + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::ECancelPrepare ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::Play() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::Play() + { + CTestFunctionCallData* data( NULL ); + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::EPlay ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::State() +// ----------------------------------------------------------------------------- +// +TMdaAudioToneUtilityState CMdaAudioToneUtility::State() + { + TMdaAudioToneUtilityState retVal; + if ( IsActive() ) + { + retVal = EMdaAudioToneUtilityNotReady; + } + else + { + retVal = EMdaAudioToneUtilityPlaying; + } + return retVal; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::CancelPlay() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::CancelPlay() + { + CTestFunctionCallData* data = NULL; + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::ECancelPlay ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + } +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::DelayAudioLoading() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::DelayAudioLoading() + { + CMdaAudioToneUtility::iDelayedAudioLoading = ETrue; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::SimulateErrorInAudioLoading() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::SimulateErrorInAudioLoading() + { + CMdaAudioToneUtility::iErrorInAudioLoading = ETrue; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::TestData() +// ----------------------------------------------------------------------------- +// +RPointerArray< CTestFunctionCallData >& CMdaAudioToneUtility::TestData() + { + return CMdaAudioToneUtility::iStaticTestData; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::ResetTestData() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::ResetTestData() + { + CMdaAudioToneUtility::iStaticTestData.ResetAndDestroy(); + CMdaAudioToneUtility::iDelayedAudioLoading = EFalse; + CMdaAudioToneUtility::iErrorInAudioLoading = EFalse; + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::DoCancel() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::DoCancel() + { + iTimer.Cancel(); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::RunL() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::RunL() + { + if ( CMdaAudioToneUtility::iErrorInAudioLoading ) + { + iObserver.MatoPrepareComplete( KGeneratedError ); + } + else + { + iObserver.MatoPrepareComplete( KErrNone ); + } + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::Stop() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::Stop() + { + CTestFunctionCallData* data( NULL ); + TRAP_IGNORE( data = CTestFunctionCallData::NewL( CMdaAudioToneUtility::EStop ) ); + CMdaAudioToneUtility::iStaticTestData.Append( data ); + } + +// ----------------------------------------------------------------------------- +// CMdaAudioToneUtility::ConstructL() +// ----------------------------------------------------------------------------- +// +void CMdaAudioToneUtility::ConstructL() + { + iTimer.CreateLocal(); + + if ( CMdaAudioToneUtility::iDelayedAudioLoading ) + { + iTimer.After( iStatus, KDelayedLoadingTime ); + } + else + { + iTimer.After( iStatus, KNormalLoadingTime ); + } + SetActive(); + } + diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/devsoundstub.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/devsoundstub.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,290 @@ + +#ifndef DEVSOUNDSTUB_H +#define DEVSOUNDSTUB_H + +// Define tone & sample players, so the original headers won't get included afterwards. +#define __MDAAUDIOTONEPLAYER_H__ + +#define __MDAAUDIOSAMPLEPLAYER_H + + +#include +#include + + +// Priority from devsound +enum TMdaPriority + { + EMdaPriorityMin = -100, + EMdaPriorityNormal = 0, + EMdaPriorityMax = 100 + }; + + +// Preference from devsound +enum TMdaPriorityPreference + { + EMdaPriorityPreferenceNone = 0, + EMdaPriorityPreferenceTime = 1, + EMdaPriorityPreferenceQuality = 2, + EMdaPriorityPreferenceTimeAndQuality = 3 + }; + +// Mda server stub definition. +class CMdaServer : public CBase + { +public: + static CMdaServer* NewL(); + ~CMdaServer(); + }; + +// Function call test data. These objects should be compared to define the test result. Devsound stub registers function call data in these objects. +class CTestFunctionCallData : public CBase + { +public: + static CTestFunctionCallData* NewL( TInt aFunctionIndex, HBufC* aString, TInt aInt1, TInt aInt2 ); + static CTestFunctionCallData* NewL( TInt aFunctionIndex, TInt aInt1, TInt aInt2 ); + static CTestFunctionCallData* NewL( TInt aFunctionIndex, TInt aInt1 = 0 ); + static CTestFunctionCallData* NewL( TInt aFunctionIndex, TInt aInt1, TTimeIntervalMicroSeconds aSeconds ); + static CTestFunctionCallData* NewL( TInt aFunctionIndex, TTimeIntervalMicroSeconds aSeconds ); + static CTestFunctionCallData* NewL( TInt aFunctionIndex, HBufC8* aString ); + + ~CTestFunctionCallData(); + + CTestFunctionCallData( TInt aFunctionIndex, HBufC* aPtr1, TInt aInt1, TInt aInt2, TTimeIntervalMicroSeconds aSeconds ); + + CTestFunctionCallData( TInt aFunctionIndex, HBufC8* aString ); + + HBufC* DesC1(); + HBufC8* DesC2(); + TInt Int1(); + TInt Int2(); + TTimeIntervalMicroSeconds Seconds(); + + TInt FunctionIndex(); + + TBool operator ==( CTestFunctionCallData& aData ); + +private: + + TInt iFunctionIndex; + HBufC* iP1; + TInt iP2; + TInt iP3; + TTimeIntervalMicroSeconds iP4; + HBufC8* iP5; + + }; + + +// M-interface from devsound for callbacks. +class MMdaAudioToneObserver + { +public: + virtual void MatoPrepareComplete(TInt aError) = 0; + virtual void MatoPlayComplete(TInt aError) = 0; + }; + + +// M-interface from devsound for callbacks. +class MMdaAudioPlayerCallback + { +public: + virtual void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration) = 0; + virtual void MapcPlayComplete(TInt aError) = 0; + }; + + +// Audio player utility stub. All imperative function calls are stored into iTestData static pointer array. +class CMdaAudioPlayerUtility : public CActive + { +public: + + // function call index. + enum TFunctionCall + { + ENewFilePlayerL, + ENewL, + ESetVolume, + ESetRepeats, + ESetVolumeRamp, + EMaxVolume, + EGetVolume, + EOpenDesL, + EPlay, + EStop + }; + + static CMdaAudioPlayerUtility* NewFilePlayerL(const TDesC& aFileName, + MMdaAudioPlayerCallback& aCallback, + TInt aPriority = EMdaPriorityNormal, + TInt aPref = EMdaPriorityPreferenceTimeAndQuality, + CMdaServer* aServer = NULL ); + static CMdaAudioPlayerUtility* NewL( MMdaAudioPlayerCallback& aCallback, + TInt aPriority = EMdaPriorityNormal, + TInt aPref = EMdaPriorityPreferenceTimeAndQuality ); + CMdaAudioPlayerUtility(MMdaAudioPlayerCallback& aObserver, TInt aPriority, TInt aPref, CMdaServer* aServer ); + ~CMdaAudioPlayerUtility(); + TInt SetVolume(TInt aVolume ); + void SetRepeats(TInt aRepeatNumberOfTimes, const TTimeIntervalMicroSeconds& aTrailingSilence); + void SetVolumeRamp(const TTimeIntervalMicroSeconds& aRampDuration); + TInt MaxVolume(); + TInt GetVolume(TInt& aVolume); + void OpenDesL(const TDesC8& aDescriptor); + + void DoCancel(); + void RunL(); + + void Play(); + void Stop(); + void Close(); + + + // Static access to test data. If used, stub object must be allocated from the same memory space as the client. + static RPointerArray< CTestFunctionCallData >& TestData(); + static void DelayAudioLoading(); + static void SimulateErrorInAudioLoading(); + static void ResetTestData(); + +private: + + void ConstructL( const TDesC& aFileName ); + + void ConstructL( const TDesC8& aFileName ); +private: + + MMdaAudioPlayerCallback& iObserver; + TInt iVolume; + TInt iMaxVolume; + TInt iPriority; + TInt iPref; + CMdaServer* iServer; + HBufC* iFile; + HBufC8* iFile8; + + RTimer iTimer; + + static RPointerArray< CTestFunctionCallData > iStaticTestData; + static bool iDelayedAudioLoading; + static bool iErrorInAudioLoading; + + }; + + + +// The state of the audio tone utility. + + enum TMdaAudioToneUtilityState + { + /** The audio tone utility has not been prepared to play a tone. + */ + EMdaAudioToneUtilityNotReady=0, + /** The audio tone utility has been prepared to play a tone and is ready. + */ + EMdaAudioToneUtilityPrepared, + /** The audio tone utility is currently playing a tone. + */ + EMdaAudioToneUtilityPlaying, + /** The audio tone utility is currently paused. + This state is only reached if underlying DevSound implementations supports resume. + */ + EMdaAudioToneUtilityPaused + }; + +// Audio tone player utility stub. All imperative function calls are stored into iTestData static pointer array. +class CMdaAudioToneUtility : public CActive + { +public: + + + // function call index. + enum TFunctionCall + { + ENewL, + EMaxVolume, + EVolume, + ESetVolume, + ESetRepeats, + ESetVolumeRamp, + EFixedSequenceCount, + EFixedSequenceName, + EPrepareToPlayTone, + EPrepareToPlayDTMFString, + EPrepareToPlayDesSequence, + EPrepareToPlayFileSequence, + EPrepareToPlayFixedSequence, + ECancelPrepare, + ECancelPlay, + EPlay, + EStop + }; + + static CMdaAudioToneUtility* NewL( MMdaAudioToneObserver& aObserver, + CMdaServer* aServer = NULL, + TInt aPriority = EMdaPriorityNormal, + TInt aPref = EMdaPriorityPreferenceTimeAndQuality ); + + + CMdaAudioToneUtility( MMdaAudioToneObserver& aObserver, + TInt aPriority, TInt aPref, CMdaServer* aServer ); + ~CMdaAudioToneUtility(); + virtual TInt MaxVolume(); + virtual TInt Volume(); + virtual void SetVolume(TInt aVolume ); + virtual void SetRepeats(TInt aRepeatNumberOfTimes, + const TTimeIntervalMicroSeconds& aTrailingSilence ); + virtual void SetVolumeRamp(const TTimeIntervalMicroSeconds& aRampDuration ); + virtual TInt FixedSequenceCount(); + virtual const TDesC& FixedSequenceName(TInt aSequenceNumber ); + virtual void PrepareToPlayTone(TInt aFrequency, + const TTimeIntervalMicroSeconds& aDuration ); + virtual void PrepareToPlayDTMFString(const TDesC& aDTMF); + virtual void PrepareToPlayDesSequence(const TDesC8& aSequence); + virtual void PrepareToPlayFileSequence(const TDesC& aFileName); + virtual void PrepareToPlayFixedSequence(TInt aSequenceNumber); + virtual void CancelPrepare(); + virtual void Play(); + virtual TMdaAudioToneUtilityState State(); + virtual void CancelPlay(); + + // Static access to test data. If used, stub object must be allocated from the same memory space as the client. + static RPointerArray< CTestFunctionCallData >& TestData(); + static void DelayAudioLoading(); + static void SimulateErrorInAudioLoading(); + static void ResetTestData(); + + + void DoCancel(); + + void RunL(); + + void Stop(); + + +private: + + void ConstructL(); + +private: + + MMdaAudioToneObserver& iObserver; + TInt iVolume; + TInt iMaxVolume; + TInt iPriority; + TInt iPref; + CMdaServer* iServer; + HBufC8* iFile8; + + + RTimer iTimer; + + + static RPointerArray< CTestFunctionCallData > iStaticTestData; + static bool iDelayedAudioLoading; + static bool iErrorInAudioLoading; + + }; + +#endif // DEVSOUNDSTUB_H + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mdaaudiosampleplayer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mdaaudiosampleplayer.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,4 @@ + +#include "devsoundstub.h" + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mdaaudiotoneplayer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mdaaudiotoneplayer.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,4 @@ + +#include "devsoundstub.h" + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mt_phoneringingtoneplayer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mt_phoneringingtoneplayer.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,734 @@ + +#include +#include + +#include "tphonecmdparamringtone.h" +#include +#include "mt_phoneringingtoneplayer.h" +#include + + +const TTimeIntervalMicroSeconds32 KInitDelay( 7000000 ); + +const TTimeIntervalMicroSeconds32 KPlayDelay( 1000000 ); + +const TTimeIntervalMicroSeconds32 KDelayToPlaybackInitPhase( 1000000 ); + +const TInt KPhoneRingingRepeatsTrailPause = 1000000; +const TInt KPhoneMdaAudioToneRepeatForever = -2; + + +_LIT( KTestDefaultTone, "z:\\data\\sounds\\digital\\Nokia tune.aac" ); + +_LIT( KRandomSample, "z:\\data\\sounds\\gee.mp3" ); + +_LIT( KRandomTone, "z:\\data\\sounds\\ring.rng" ); + + +_LIT8( KPhoneNoSoundSequence, "\x00\x11\x06\x05\xFC\x0A\x08\x40\x32\x0A\xF7\x40\x64\x06\x0B" ); +//_LIT8( KPhoneBeepSequence, "\x00\x11\x0A\x0A\x08\x73\x0A\x40\x28\x0A\xF7\x05\xFC\x40\x64\x0A\x08\x40\x32\x0A\xF7\x06\x0B" ); + + +MT_PhoneRingingTonePlayer* MT_PhoneRingingTonePlayer::NewL() + { + MT_PhoneRingingTonePlayer* self = MT_PhoneRingingTonePlayer::NewLC(); + CleanupStack::Pop(); + return self; + } + +MT_PhoneRingingTonePlayer* MT_PhoneRingingTonePlayer::NewLC() + { + MT_PhoneRingingTonePlayer* self = new( ELeave ) MT_PhoneRingingTonePlayer(); + CleanupStack::PushL( self ); + self->ConstructL(); + return self; + } + + +MT_PhoneRingingTonePlayer::~MT_PhoneRingingTonePlayer() + { + Teardown(); + } + + +MT_PhoneRingingTonePlayer::MT_PhoneRingingTonePlayer() + { + + } + +void MT_PhoneRingingTonePlayer::ConstructL() + { + CEUnitTestSuiteClass::ConstructL(); + } + + +void MT_PhoneRingingTonePlayer::SetupL() + { + iClient.Connect(); + } + + +void MT_PhoneRingingTonePlayer::Teardown() + { + CMdaAudioPlayerUtility::ResetTestData(); + CMdaAudioToneUtility::ResetTestData(); + iClient.Close(); + User::After( KInitDelay ); + } + +void MT_PhoneRingingTonePlayer::EmptySetupL() + { + + } + +void MT_PhoneRingingTonePlayer::EmptyTeardown() + { + + } + +void MT_PhoneRingingTonePlayer::MT_Empty() + { + + } +void MT_PhoneRingingTonePlayer::MT_CreateServerInstanceAndConnectL() + { + RPhoneToneClient client; + TInt error = client.Connect(); + User::After( KInitDelay ); + EUNIT_ASSERT_EQUALS( KErrNone, error ); + CMdaAudioPlayerUtility::ResetTestData(); + CMdaAudioToneUtility::ResetTestData(); + client.Close(); + + } + +void MT_PhoneRingingTonePlayer::MT_CreateServerInstanceAndConnectTwiceL() // Inter-process communication fuzzing ( IPC - fuzz ) + { + // SetupL creates a server instance and connects to it. + RPhoneToneClient client; + TInt error = client.Connect(); + User::After( KInitDelay ); + // Assert if server accepts multiple connections. + // Server should be uniquely connectable. + EUNIT_ASSERT_EQUALS( KErrNone != error, ETrue ); + + if ( !error ) + { + client.Close(); + } + } + +void MT_PhoneRingingTonePlayer::MT_PlayDefaultL() + { + User::After( KInitDelay ); + TInt randomVolume( 8 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume , randomVolume ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + +void MT_PhoneRingingTonePlayer::MT_PlayCustomSampleL() + { + User::After( KInitDelay ); + TInt randomVolume( 8 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomSample() ); + iClient.PlayRingingToneL( &ringToneParam ); + //Wait that ringingtone is prepared. + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KRandomSample().Length() ); + *tonePath = KRandomSample(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume , + randomVolume ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + +void MT_PhoneRingingTonePlayer::MT_PlayCustomSampleWithDelayL() + { + User::After( KInitDelay ); + + CMdaAudioPlayerUtility::DelayAudioLoading(); + + TInt randomVolume( 10 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomSample() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume , randomVolume ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + +// Switch to default playback +void MT_PhoneRingingTonePlayer::MT_PlayCustomSampleWithErrorL() + { + User::After( KInitDelay ); + + CMdaAudioPlayerUtility::SimulateErrorInAudioLoading(); + + TInt randomVolume( 8 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomSample() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + + //Error will occur in initialization. Thus default tone should be played. + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume , + randomVolume ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + +// backup timer callback +void MT_PhoneRingingTonePlayer::MT_PlayCustomSampleWithDelayAndErrorL() + { + User::After( KInitDelay ); + + CMdaAudioPlayerUtility::DelayAudioLoading(); + CMdaAudioPlayerUtility::SimulateErrorInAudioLoading(); + + TInt randomVolume( 8 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomSample() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume, + randomVolume ); + + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsOnlyOneCall( CMdaAudioPlayerUtility::EPlay ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + + +/******************************* +/ Next tests for rng file type +/*******************************/ + +void MT_PhoneRingingTonePlayer::MT_PlayCustomToneL() + { + User::After( KInitDelay ); + TInt randomVolume( 1 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomTone() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KRandomTone().Length() ); + *tonePath = KRandomTone(); + CleanupStack::PushL( tonePath ); + + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::EPrepareToPlayFileSequence, tonePath,0,0 ); // Transfer tonePath ownership + + CleanupStack::Pop( tonePath ); + + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::EPlay ); + + CleanupStack::PushL( data2 ); + CTestFunctionCallData* data3 = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::ESetVolume, randomVolume ); + /* do repeat check */ +// KPhoneMdaAudioToneRepeatForever, +// TTimeIntervalMicroSeconds( KPhoneRingingRepeatsTrailPause ) + + EUNIT_ASSERT_EQUALS( TonePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( TonePlayerContainsCallData( data2 ) , ETrue ); + EUNIT_ASSERT_EQUALS( TonePlayerContainsCallData( data3 ) , ETrue ); + delete data3; + CleanupStack::PopAndDestroy( data2 ); + CleanupStack::PopAndDestroy( data1 ); + } + +void MT_PhoneRingingTonePlayer::MT_PlayCustomToneWithDelayL() + { + User::After( KInitDelay ); + + CMdaAudioToneUtility::DelayAudioLoading(); + + TInt randomVolume( 8 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomTone() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume , randomVolume ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + +void MT_PhoneRingingTonePlayer::MT_PlayCustomToneWithErrorL() + { + User::After( KInitDelay ); + + CMdaAudioToneUtility::SimulateErrorInAudioLoading(); + + TInt randomVolume( 4 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomTone() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume, randomVolume ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + +void MT_PhoneRingingTonePlayer::MT_PlayCustomToneWithDelayAndErrorL() + { + User::After( KInitDelay ); + + CMdaAudioToneUtility::DelayAudioLoading(); + CMdaAudioToneUtility::SimulateErrorInAudioLoading(); + + TInt randomVolume( 2 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + ringToneParam.SetRingTone( KRandomTone() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KInitDelay ); + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume , randomVolume ); + + CleanupStack::PushL( data2 ); + + CTestFunctionCallData* data3 = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::ECancelPrepare ); + + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + EUNIT_ASSERT_EQUALS( TonePlayerContainsCallData( data3 ) , ETrue ); + delete data3; + CleanupStack::PopAndDestroy( data2 ); + CleanupStack::PopAndDestroy( data1 ); + } + +void MT_PhoneRingingTonePlayer::MT_PlayAndStopL() + { + User::After( KInitDelay ); + TInt randomVolume( 8 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingingType( EProfileRingingTypeRinging ); + iClient.PlayRingingToneL( &ringToneParam ); + + User::After( KInitDelay ); + + iClient.StopPlayingL(); + + HBufC* tonePath = HBufC::NewL( KTestDefaultTone().Length() ); + *tonePath = KTestDefaultTone(); + CleanupStack::PushL( tonePath ); + CTestFunctionCallData* data1 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::EPlay, + tonePath, 0, 0 ); // Transfer tonePath ownership + CleanupStack::Pop( tonePath ); + CleanupStack::PushL( data1 ); + CTestFunctionCallData* data2 = CTestFunctionCallData::NewL( + CMdaAudioPlayerUtility::ESetVolume , randomVolume ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCallData( data2 ) , ETrue ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCall( CMdaAudioPlayerUtility::EStop ) , ETrue ); + delete data2; + CleanupStack::PopAndDestroy( data1 ); + } + +void MT_PhoneRingingTonePlayer::MT_PlayAndStopDuringInitL() + { + User::After( KInitDelay ); + + CMdaAudioToneUtility::DelayAudioLoading(); + + TInt randomVolume( 8 ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetVolume( randomVolume ); + ringToneParam.SetRingTone( KRandomSample() ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KDelayToPlaybackInitPhase ); + + iClient.StopPlayingL(); + + User::After( KPlayDelay ); + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCall( + CMdaAudioPlayerUtility::ENewFilePlayerL ) , ETrue ); + + // Shouldn't contain 'Play' call. + EUNIT_ASSERT_EQUALS( SamplePlayerContainsCall( + CMdaAudioPlayerUtility::EPlay ) , EFalse ); + } + +void MT_PhoneRingingTonePlayer::MT_PlaySilentL() + { + User::After( KInitDelay ); + TPhoneCmdParamRingTone ringToneParam; + ringToneParam.SetRingingType( EProfileRingingTypeSilent ); + iClient.PlayRingingToneL( &ringToneParam ); + User::After( KPlayDelay ); + + HBufC8* sequence( NULL ); + TRAP_IGNORE( sequence = HBufC8::NewL( KPhoneNoSoundSequence().Length() ) ); + if ( sequence ) + { + *sequence = KPhoneNoSoundSequence(); + } + + CTestFunctionCallData* data( NULL ); + data = CTestFunctionCallData::NewL( + CMdaAudioToneUtility::EPrepareToPlayDesSequence, sequence ); + + CleanupStack::PushL( data ); + CTestFunctionCallData* data1( NULL ); + data1 = CTestFunctionCallData::NewL( CMdaAudioToneUtility::EPlay ); + + EUNIT_ASSERT_EQUALS( TonePlayerContainsCallData( data1 ) , ETrue ); + EUNIT_ASSERT_EQUALS( TonePlayerContainsCallData( data ), ETrue ); + delete data1; + CleanupStack::PopAndDestroy( data ); + } + +//******************* +/* End of test cases +********************/ + + + +TBool MT_PhoneRingingTonePlayer::SamplePlayerContainsCall( CMdaAudioPlayerUtility::TFunctionCall aCall ) + { + RPointerArray< CTestFunctionCallData >& array = CMdaAudioPlayerUtility::TestData(); + TBool found( EFalse ); + for( TInt i( 0 ); i < array.Count(); i++ ) + { + CTestFunctionCallData* ptr = array[ i ]; + if ( ptr->FunctionIndex() == aCall ) + { + found = ETrue; + i = array.Count(); + } + } + return found; + } + +TBool MT_PhoneRingingTonePlayer::SamplePlayerContainsCallData( + CTestFunctionCallData* aData ) + { + if ( !aData ) + { + return EFalse; + } + + RPointerArray< CTestFunctionCallData >& array = CMdaAudioPlayerUtility::TestData(); + TBool found( EFalse ); + for( TInt i( 0 ); i < array.Count(); i++ ) + { + CTestFunctionCallData* ptr = array[ i ]; + if ( ( *ptr ) == *aData ) + { + found = ETrue; + i = array.Count(); + } + } + return found; + } + +TBool MT_PhoneRingingTonePlayer::SamplePlayerContainsOnlyOneCall( + CMdaAudioPlayerUtility::TFunctionCall aCall ) + { + TInt count( 0 ); + for( TInt i( 0 ); i < CMdaAudioPlayerUtility::TestData().Count(); i++ ) + { + if ( CMdaAudioPlayerUtility::TestData()[ i ]->FunctionIndex() == aCall ) + { + count++; + } + } + return ( 1 == count ); + } + +TBool MT_PhoneRingingTonePlayer::TonePlayerContainsOnlyOneCall( CMdaAudioToneUtility::TFunctionCall aCall ) + { + TInt count( 0 ); + for( TInt i( 0 ); i < CMdaAudioToneUtility::TestData().Count(); i++ ) + { + if ( CMdaAudioToneUtility::TestData()[ i ]->FunctionIndex() == aCall ) + { + count++; + } + } + return ( 1 == count ); + } + +TBool MT_PhoneRingingTonePlayer::TonePlayerContainsCall( + CMdaAudioToneUtility::TFunctionCall aCall ) + { + RPointerArray< CTestFunctionCallData >& array = CMdaAudioToneUtility::TestData(); + TBool found( EFalse ); + for( TInt i( 0 ); i < array.Count(); i++ ) + { + CTestFunctionCallData* ptr = array[ i ]; + if ( ptr->FunctionIndex() == aCall ) + { + found = ETrue; + i = array.Count(); + } + } + return found; + } + +TBool MT_PhoneRingingTonePlayer::TonePlayerContainsCallData( + CTestFunctionCallData* aData ) + { + if ( !aData ) + { + return EFalse; + } + RPointerArray< CTestFunctionCallData >& array = CMdaAudioToneUtility::TestData(); + TBool found( EFalse ); + for( TInt i( 0 ); i < array.Count(); i++ ) + { + CTestFunctionCallData* ptr = array[ i ]; + if ( ( *ptr ) == *aData ) + { + found = ETrue; + i = array.Count(); + } + } + return found; + } + + + +/////////////////////////////////////////////////////////////////////////////////// +//// TEST TABLE +/////////////////////////////////////////////////////////////////////////////////// +EUNIT_BEGIN_TEST_TABLE( + MT_PhoneRingingTonePlayer, + "Add test suite description here.", + "MODULE" ) + + +// EUNIT_TEST( +// "PTP:Init and connect", +// "RPhoneToneClient", +// "Connect", +// "FUNCTIONALITY", +// EmptySetupL, MT_Empty, EmptyTeardown ) + +EUNIT_TEST( + "PTP:Init and connect", + "RPhoneToneClient", + "Connect", + "FUNCTIONALITY", + EmptySetupL, MT_CreateServerInstanceAndConnectL, EmptyTeardown ) + + +EUNIT_TEST( + "PTP:Init and connect twice", + "RPhoneToneClient", + "ConnectTwice", + "FUNCTIONALITY", + SetupL, MT_CreateServerInstanceAndConnectTwiceL, Teardown ) + + +EUNIT_TEST( + "PTP:Play default", + "RPhoneToneClient", + "Play", + "FUNCTIONALITY", + SetupL, MT_PlayDefaultL, Teardown ) + + +EUNIT_TEST( + "PTP:Play custom sample", + "RPhoneToneClient", + "Play", + "FUNCTIONALITY", + SetupL, MT_PlayCustomSampleL, Teardown ) + + +EUNIT_TEST( + "PTP:Play custom sample with delay", + "RPhoneToneClient", + "Play", + "FUNCTIONALITY", + SetupL, MT_PlayCustomSampleWithDelayL, Teardown ) + + +EUNIT_TEST( + "PTP:Play tone with error init", + "RPhoneToneClient", + "PlayWithError", + "FUNCTIONALITY", + SetupL, MT_PlayCustomSampleWithErrorL, Teardown ) + + +EUNIT_TEST( + "PTP:Play tone with delayed init and error", + "RPhoneToneClient", + "PlayWithDelay", + "FUNCTIONALITY", + SetupL, MT_PlayCustomSampleWithDelayAndErrorL, Teardown ) + + +EUNIT_TEST( + "PTP:Play custom tone", + "RPhoneToneClient", + "PlayCustomTone", + "FUNCTIONALITY", + SetupL, MT_PlayCustomToneL, Teardown ) + + +EUNIT_TEST( + "PTP:Play custom tone with delayed init", + "RPhoneToneClient", + "PlayCustomToneWithDelay", + "FUNCTIONALITY", + SetupL, MT_PlayCustomToneWithDelayL, Teardown ) + + +EUNIT_TEST( + "PTP:Play tone with error", + "RPhoneToneClient", + "PlayCustomToneWithError", + "FUNCTIONALITY", + SetupL, MT_PlayCustomToneWithErrorL, Teardown ) + + +EUNIT_TEST( + "PTP:Play custom tone with delay and error", + "RPhoneToneClient", + "PlayCustomToneWithDelayAndError", + "FUNCTIONALITY", + SetupL, MT_PlayCustomToneWithDelayAndErrorL, Teardown ) + + +EUNIT_TEST( + "PTP:Play tone and stop", + "RPhoneToneClient", + "PlayAndStop", + "FUNCTIONALITY", + SetupL, MT_PlayAndStopL, Teardown ) + + +EUNIT_TEST( + "PTP:Play tone and stop during playback init", + "RPhoneToneClient", + "PlayAndStop", + "FUNCTIONALITY", + SetupL, MT_PlayAndStopDuringInitL, Teardown ) + + +EUNIT_TEST( + "PTP:Play silent tone", + "RPhoneToneClient", + "PlaySilent", + "FUNCTIONALITY", + SetupL, MT_PlaySilentL, Teardown ) + + +EUNIT_END_TEST_TABLE + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mt_phoneringingtoneplayer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mt_phoneringingtoneplayer.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,113 @@ + +/* +* Copyright (c) 2010-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: MT_PhoneRingingTonePlayer +* +*/ + +#ifndef __MT_PHONERINGINGTONEPLAYER_H__ +#define __MT_PHONERINGINGTONEPLAYER_H__ + +#include + +#include "devsoundstub.h" +#include "rphonetoneclient.h" + +#include +#ifndef NONSHARABLE_CLASS + #define NONSHARABLE_CLASS(x) class x +#endif + +NONSHARABLE_CLASS( MT_PhoneRingingTonePlayer ) + : public CEUnitTestSuiteClass + { +public: + + static MT_PhoneRingingTonePlayer* NewL(); + static MT_PhoneRingingTonePlayer* NewLC(); + ~MT_PhoneRingingTonePlayer(); + +private: + + MT_PhoneRingingTonePlayer(); + void ConstructL(); + +private: + + void SetupL(); + + void Teardown(); + + void EmptySetupL(); + + void EmptyTeardown(); + + // Test cases : + + void MT_Empty(); + + /*done*/ void MT_CreateServerInstanceAndConnectL(); + + /*done*/ void MT_CreateServerInstanceAndConnectTwiceL(); // Inter-process communication fuzzing ( IPC - fuzz ) + + /*done*/ void MT_PlayDefaultL(); + + /*done*/ void MT_PlayCustomSampleL(); + + /*done*/ void MT_PlayCustomSampleWithDelayL(); + + /*done*/ void MT_PlayCustomSampleWithErrorL(); // Switch to default playback + + /*done*/ void MT_PlayCustomSampleWithDelayAndErrorL(); // timer callback + + /*done*/ void MT_PlayCustomToneL(); + + /*done*/ void MT_PlayCustomToneWithDelayL(); + + /*done*/ void MT_PlayCustomToneWithErrorL(); + + /*done*/ void MT_PlayCustomToneWithDelayAndErrorL(); + + /*done*/ void MT_PlayAndStopL(); + + /*done*/ void MT_PlayAndStopDuringInitL(); + + /*done*/ void MT_PlaySilentL(); + + +private: + + // Utility functions + + TBool SamplePlayerContainsCall( CMdaAudioPlayerUtility::TFunctionCall aCall ); + TBool SamplePlayerContainsCallData( CTestFunctionCallData* aData ); + TBool SamplePlayerContainsOnlyOneCall( CMdaAudioPlayerUtility::TFunctionCall aCall ); + TBool TonePlayerContainsOnlyOneCall( CMdaAudioToneUtility::TFunctionCall aCall ); + TBool TonePlayerContainsCall( CMdaAudioToneUtility::TFunctionCall aCall ); + TBool TonePlayerContainsCallData( CTestFunctionCallData* aData ); + +private: + + RPhoneToneClient iClient; + + + EUNIT_DECLARE_TEST_TABLE; + + + + }; + +#endif // __MT_PHONERINGINGTONEPLAYER_H__ + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mt_phoneringingtoneplayermain.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/mt_phoneringingtoneplayer/src/mt_phoneringingtoneplayermain.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2010-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: MT_Phoneringingtoneplayer +* +*/ + +// CLASS HEADER +#include "mt_phoneringingtoneplayer.h" + +// EXTERNAL INCLUDES +#include + +/** + * Test suite factory function. + */ +EXPORT_C MEUnitTest* CreateTestSuiteL() + { + return MT_PhoneRingingTonePlayer::NewL(); + } + + + +// END OF FILE + + + diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/run_auto_tests.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneringingtoneplayer/tsrc/run_auto_tests.bat Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,229 @@ +rem +rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +rem All rights reserved. +rem This component and the accompanying materials are made available +rem under the terms of the License "Symbian Foundation License v1.0" +rem which accompanies this distribution, and is available +rem at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +rem +rem Initial Contributors: +rem Nokia Corporation - initial contribution. +rem +rem Contributors: +rem +rem Description: +rem + +@echo off +setlocal +goto :startup + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function DEFAULT +:: +:: Modify this function +:: - TESTED_SRC can be changed to match tested code. +:: Specifies path from testcode group directory to +:: tested code +:: - Add test directories to be runned +:: ie. "call :build ut_projectdirectory" or use +:: "for /f %%a in ('dir /b ut_*') do call :build %%a" +:: which compiles, instruments and runs all test directories +:: starting with "ut_". +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:DEFAULT +set TESTED_SRC=..\..\..\src\* + +for /f %%a in ('dir /b ut_*') do call :build %%a + +if [%DOMODULESTESTS%] EQU [TRUE] ( +for /f %%a in ('dir /b mt_*') do call :build %%a +) + + +call :finish +goto :END + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function STARTUP +:: +:: Initializing script +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:STARTUP + +set BUILDTESTS=TRUE +set RUNTESTS=TRUE +set REMOVETESTS=TRUE +set INSTRUMENT=TRUE +set REMOVEINSTRUMENT=TRUE +set DOMODULESTESTS=TRUE +set SBS_CALL=sbs --config winscw_udeb.test --keepgoing BUILD +set PATH_TO_DLL=\epoc32\release\winscw\udeb +set PATH_TO_MOVE_DLL=\epoc32\release\winscw\udeb\z\sys\bin +set PATH_TO_COVERAGE_DATA=\coverage_data + + +if not exist %PATH_TO_DLL%\eunitexerunner.exe ( +echo EUnit not installed! +goto end +) + +if not exist %PATH_TO_COVERAGE_DATA% ( +mkdir %PATH_TO_COVERAGE_DATA% +) + +if [%1] EQU [] ( goto default ) + +call :%1 +call :%2 +call :%3 +call :%4 +call :%5 +echo Running tests = %RUNTESTS% +echo Instrumenting tests = %INSTRUMENT% +goto default + +:/NOCLEANUP +set REMOVEINSTRUMENT=FALSE +set REMOVETESTS=FALSE +goto end + +:/NORUN +set RUNTESTS=FALSE +set REMOVEINSTRUMENT=FALSE +set REMOVETESTS=FALSE +goto end + +:/NOINSTRUMENT +set INSTRUMENT=FALSE +goto end + +:/NOBUILD +set BUILDTESTS=FALSE +goto end + +:/ONLYUNITTESTS +set DOMODULESTESTS=FALSE +goto end + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function FINISH +:: +:: Finishes run_auto_tests.bat +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:FINISH +call :move + +if [%RUNTESTS%] EQU [TRUE] ( +call :runtests +) + +if [%REMOVETESTS%] EQU [TRUE] ( +call :removetests +) + +if [%INSTRUMENT%] EQU [TRUE] ( +call :calculatecoverage +) + +if [%REMOVEINSTRUMENT%] EQU [TRUE] ( +call :removecoverage +) +goto end + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function BUILD +:: param directory +:: +:: builds test from given directory +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:BUILD +setlocal +if [%BUILDTESTS%] EQU [FALSE] ( goto end ) +echo Building %1 +if not exist %1 ( +echo %1 Not found! +goto end +) + +pushd . +call cd %1\group +call sbs --config winscw_udeb.test --keepgoing CLEAN +if [%INSTRUMENT%] EQU [TRUE] ( +call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%" +) else ( +call %SBS_CALL% +) + +popd +endlocal +goto end + + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function MOVE +:: +:: moves compiled tests to eunit directory +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:MOVE +echo Moving tests +call move %PATH_TO_DLL%\ut_*.dll %PATH_TO_MOVE_DLL% +call move %PATH_TO_DLL%\mt_*.dll %PATH_TO_MOVE_DLL% +goto end + + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function RUNTESTS +:: +:: Runs tests in eunit directory +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:RUNTESTS +echo Running tests +call %PATH_TO_DLL%\eunitexerunner.exe -dtextshell -- +copy \epoc32\winscw\c\shared\EUnit\Logs\EUnit_log.xml \lastrun_EUnit_log.xml +goto end + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function CALCULATECOVERAGE +:: +:: Calculates test coverage. Generates html +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:CALCULATECOVERAGE +echo Calculating coverage +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 + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function REMOVETESTS +:: +:: Removes tests from eunit directory +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:REMOVETESTS +echo Removing Test dlls +call sleep 3 +call del %PATH_TO_MOVE_DLL%\t_*.dll +call del %PATH_TO_MOVE_DLL%\mt_*.dll +call del %PATH_TO_MOVE_DLL%\ut_*.dll +call del %PATH_TO_MOVE_DLL%\it_*.dll +goto end + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function REMOVECOVERAGE +:: +:: Removes data from coverage directory +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:REMOVECOVERAGE +echo Removing deleting coverage data +call del %PATH_TO_COVERAGE_DATA%\*.sym +call del %PATH_TO_COVERAGE_DATA%\*.dat +call del profile.txt +goto end + +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: function END +:: +:: Prints done +:::::::::::::::::::::::::::::::::::::::::::::::::::::: +:END +echo Done! \ No newline at end of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/main.cpp --- a/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/main.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include "t_phoneringingtoneplayer.h" - - -int main(int argc, char *argv[]) -{ - HbApplication app (argc, argv); - // main window widget instantiated. - // includes decorators such as signal strength and battery life indicator. - HbMainWindow mainWindow; - t_phoneringingtoneplayer* player = new t_phoneringingtoneplayer (); - mainWindow.addView(player); - mainWindow.setCurrentView(player); - mainWindow.show(); - return app.exec(); -} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/sample.mp3 Binary file phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/sample.mp3 has changed diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.cpp --- a/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,214 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include -#include -#include -#include -#include -#include "t_phoneringingtoneplayer.h" -#include "cphoneringingtonecontroller.h" -#include "TPhoneCmdParamRingTone.h" - - -_LIT(KNokiatune, "Z:\\Data\\Sounds\\Digital\\Nokia tune.aac"); -_LIT(KSamplemp3, "c:\\Data\\Sounds\\Digital\\sample.mp3"); - -t_phoneringingtoneplayer::t_phoneringingtoneplayer(QGraphicsItem *parent) - : HbView(parent), m_volume(10) -{ - setTitle(tr("t_ringingtoneplayer")); - createMenu(); - createContent(); - - m_ringingtone.Format(KNokiatune); - m_ringingtoneplayer = CPhoneRingingToneController::NewL(); -} - -t_phoneringingtoneplayer::~t_phoneringingtoneplayer() -{ - delete m_ringingtoneplayer; -} -void t_phoneringingtoneplayer::createMenu() -{ - HbMenu *optionsMenu = menu(); - /*connect(optionsMenu->addAction(tr("EProfileRingingTypeRinging"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneRingning())); - connect(optionsMenu->addAction(tr("EProfileRingingTypeBeepOnce"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneBeepOnce())); - connect(optionsMenu->addAction(tr("EProfileRingingTypeSilent"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneSilence())); - connect(optionsMenu->addAction(tr("EProfileRingingTypeRinging+tts"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneTTS())); - connect(optionsMenu->addAction(tr("EProfileRingingTypeAscending"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneAscending())); - connect(optionsMenu->addAction(tr("EProfileRingingTypeRingingOnce"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneOnce())); - connect(optionsMenu->addAction(tr("Stop ringingtone"))->action(), SIGNAL(triggered()), this, SLOT(StopRingingtone())); */ - connect(optionsMenu->addAction(tr("sample.mp3")), SIGNAL(triggered()), this, SLOT(SampleMP3())); - connect(optionsMenu->addAction(tr("nokiatune.aac")), SIGNAL(triggered()), this, SLOT(Nokiatuneaac())); - //connect(optionsMenu->addAction(tr("Quit"))->action(), SIGNAL(triggered()), qApp, SLOT(quit())); -} - -void t_phoneringingtoneplayer::createContent() -{ - QGraphicsLinearLayout *mainLayout = new QGraphicsLinearLayout(Qt::Vertical); - - HbPushButton *ringingButton = new HbPushButton(tr("EProfileRingingTypeRinging"), this); - connect(ringingButton, SIGNAL(clicked()), this, SLOT(PlayRingingtoneRingning())); - - HbPushButton *beeponceButton = new HbPushButton(tr("EProfileRingingTypeBeepOnce"), this); - connect(beeponceButton, SIGNAL(clicked()), this, SLOT(PlayRingingtoneBeepOnce())); - - HbPushButton *silenceButton = new HbPushButton(tr("EProfileRingingTypeSilent"), this); - connect(silenceButton, SIGNAL(clicked()), this, SLOT(PlayRingingtoneSilence())); - - HbPushButton *ttsButton = new HbPushButton(tr("EProfileRingingTypeRinging+tts"), this); - connect(ttsButton, SIGNAL(clicked()), this, SLOT(PlayRingingtoneTTS())); - - HbPushButton *ascendingButton = new HbPushButton(tr("EProfileRingingTypeAscending"), this); - connect(ascendingButton, SIGNAL(clicked()), this, SLOT(PlayRingingtoneAscending())); - - HbPushButton *ringingonceButton = new HbPushButton(tr("EProfileRingingTypeRingingOnce"), this); - connect(ringingonceButton, SIGNAL(clicked()), this, SLOT(PlayRingingtoneOnce())); - - HbPushButton *stopButton = new HbPushButton(tr("Stop ringingtone"), this); - connect(stopButton, SIGNAL(clicked()), this, SLOT(StopRingingtone())); - - HbPushButton *quitButton = new HbPushButton(tr("Quit"), this); - connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit())); - - HbSlider *volumeslider = new HbSlider(this); - //volumeslider->setSliderType(HbSlider::VolumeSlider); - volumeslider->setOrientation( Qt::Horizontal); - volumeslider->setMinimum(EProfileRingingVolumeLevel1); - volumeslider->setMaximum(EProfileRingingVolumeLevel10); - volumeslider->setSingleStep(1); - volumeslider->setValue(m_volume); - connect(volumeslider, SIGNAL(valueChanged(int)), this, SLOT(volumeSliderChanged(int))); - - mainLayout->addItem(volumeslider); - mainLayout->addItem(ringingButton); - mainLayout->addItem(beeponceButton); - mainLayout->addItem(silenceButton); - mainLayout->addItem(ttsButton); - mainLayout->addItem(ascendingButton); - mainLayout->addItem(ringingonceButton); - mainLayout->addItem(stopButton); - mainLayout->addItem(quitButton); - //mainLayout->addStretch(); - - setLayout(mainLayout); -} - -void t_phoneringingtoneplayer::PlayRingingtoneRingning() -{ - m_ringingtoneplayer->StopPlaying(); - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(m_volume); - ringToneParam.SetRingingType(EProfileRingingTypeRinging); - // Set the profile ring tone - ringToneParam.SetRingTone( m_ringingtone); - ringToneParam.SetType( EPhoneRingToneProfile ); - - m_ringingtoneplayer->PlayRingToneL( &ringToneParam ); -} - -void t_phoneringingtoneplayer::PlayRingingtoneBeepOnce() -{ - m_ringingtoneplayer->StopPlaying(); - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(m_volume); - ringToneParam.SetRingingType(EProfileRingingTypeBeepOnce); - // Set the profile ring tone - ringToneParam.SetRingTone( m_ringingtone); - ringToneParam.SetType( EPhoneRingToneProfile ); - - m_ringingtoneplayer->PlayRingToneL( &ringToneParam ); -} - - -void t_phoneringingtoneplayer::PlayRingingtoneSilence() -{ - m_ringingtoneplayer->StopPlaying(); - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(m_volume); - ringToneParam.SetRingingType(EProfileRingingTypeSilent); - // Set the profile ring tone - ringToneParam.SetRingTone( m_ringingtone); - ringToneParam.SetType( EPhoneRingToneProfile ); - - m_ringingtoneplayer->PlayRingToneL( &ringToneParam ); -} - -void t_phoneringingtoneplayer::PlayRingingtoneTTS() -{ - m_ringingtoneplayer->StopPlaying(); - _LIT(KTextToSay, "Mr. Brownstone"); - TBuf<30> texttosay (KTextToSay); - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(m_volume); - ringToneParam.SetRingingType(EProfileRingingTypeRinging); - ringToneParam.SetTextToSay(texttosay); - // Set the profile ring tone - ringToneParam.SetRingTone( m_ringingtone); - ringToneParam.SetType( EPhoneRingToneProfile ); - - m_ringingtoneplayer->PlayRingToneL( &ringToneParam ); -} - -void t_phoneringingtoneplayer::PlayRingingtoneAscending() -{ - m_ringingtoneplayer->StopPlaying(); - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(m_volume); - ringToneParam.SetRingingType(EProfileRingingTypeAscending); - // Set the profile ring tone - ringToneParam.SetRingTone( m_ringingtone); - ringToneParam.SetType( EPhoneRingToneProfile ); - - m_ringingtoneplayer->PlayRingToneL( &ringToneParam ); -} - -void t_phoneringingtoneplayer::PlayRingingtoneOnce() -{ - m_ringingtoneplayer->StopPlaying(); - - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(m_volume); - ringToneParam.SetRingingType(EProfileRingingTypeRingingOnce); - // Set the profile ring tone - ringToneParam.SetRingTone(m_ringingtone); - ringToneParam.SetType( EPhoneRingToneProfile ); - - m_ringingtoneplayer->PlayRingToneL( &ringToneParam ); -} - - -void t_phoneringingtoneplayer::StopRingingtone() -{ - m_ringingtoneplayer->StopPlaying(); -} - -void t_phoneringingtoneplayer::SampleMP3() -{ - m_ringingtone.Format(KSamplemp3); -} -void t_phoneringingtoneplayer::Nokiatuneaac() -{ - m_ringingtone.Format(KNokiatune); -} -void t_phoneringingtoneplayer::volumeSliderChanged(int value) - { - m_volume = value; - } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.h --- a/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +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 T_PHONERINGINGTONEPLAYER_H -#define T_PHONERINGINGTONEPLAYER_H - -#include -#include - -class CPhoneRingingToneController; - -class t_phoneringingtoneplayer : public HbView -{ - Q_OBJECT - -public: - t_phoneringingtoneplayer(QGraphicsItem *parent = 0); - ~t_phoneringingtoneplayer(); - -private: - void createMenu(); - void createContent(); - -protected slots: - void PlayRingingtoneRingning(); - void StopRingingtone(); - void PlayRingingtoneBeepOnce(); - void PlayRingingtoneSilence(); - void PlayRingingtoneTTS(); - void PlayRingingtoneAscending(); - void PlayRingingtoneOnce(); - void SampleMP3(); - void Nokiatuneaac(); - void volumeSliderChanged(int value); - -private: - - TBuf<50> m_ringingtone; - int m_volume; - CPhoneRingingToneController *m_ringingtoneplayer; -}; - -#endif // T_PHONERINGINGTONEPLAYER_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.pro --- a/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.pro Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +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: -# -# - -TEMPLATE = app -TARGET = t_phoneringingtoneplayer -CONFIG += hb - -symbian { - - INCLUDEPATH += /epoc32/include/platform/mw \ - /epoc32/include/platform \ - ../../../phoneuiutils/inc \ - ../../../phoneuiview2/src \ - ../../../phoneuiqtviewadapter/inc \ - ../../inc \ - ../../../phonemediatorcenter/inc - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - - LIBS += -lphoneringingtoneplayer \ - -lphoneuiutils - - TARGET.CAPABILITY = ALL -TCB - DEFINES += FT_SYMBIAN_INTEGRATION -} - -HEADERS += t_phoneringingtoneplayer.h -SOURCES += t_phoneringingtoneplayer_reg.rss \ - main.cpp \ - t_phoneringingtoneplayer.cpp - -RESOURCES += - -symbian:TARGET.UID3 = 0xE87E453C - - -symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer_armv5_urel.sis Binary file phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer_armv5_urel.sis has changed diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/bwins/ut_cphoneringingtonecontrolleru.def --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/bwins/ut_cphoneringingtonecontrolleru.def Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -EXPORTS - ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void) - ?StopPlaying@CPhoneRingingToneController@@QAEXXZ @ 2 NONAME ; void CPhoneRingingToneController::StopPlaying(void) - ?PlayRingToneL@CPhoneRingingToneController@@QAEXPAVTPhoneCommandParam@@@Z @ 3 NONAME ; void CPhoneRingingToneController::PlayRingToneL(class TPhoneCommandParam *) - ?NewL@CPhoneRingingToneController@@SAPAV1@XZ @ 4 NONAME ; class CPhoneRingingToneController * CPhoneRingingToneController::NewL(void) - ?MuteRingingToneOnAnswer@CPhoneRingingToneController@@QAEXXZ @ 5 NONAME ; void CPhoneRingingToneController::MuteRingingToneOnAnswer(void) - ?MuteRingingTone@CPhoneRingingToneController@@QAEXXZ @ 6 NONAME ; void CPhoneRingingToneController::MuteRingingTone(void) - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/group/bld.inf --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/group/bld.inf Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -PRJ_PLATFORMS - DEFAULT - -PRJ_EXPORTS - -PRJ_MMPFILES - - -PRJ_TESTMMPFILES -ut_cphoneringingtonecontroller.mmp - - -// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/group/ut_cphoneringingtonecontroller.mmp --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/group/ut_cphoneringingtonecontroller.mmp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include - -TARGET ut_cphoneringingtonecontroller.dll -TARGETTYPE dll -UID 0x1000af5a 0x01700000 - -CAPABILITY ALL -TCB -DRM -VENDORID VID_DEFAULT - -SOURCEPATH ../src -SOURCE ut_cphoneringingtonecontroller.cpp -SOURCE ut_cphoneringingtonecontroller_dllmain.cpp - -// Code under test -SOURCEPATH ../../../src -SOURCE cphoneringingtonecontroller.cpp -SOURCE cphoneringingtone.cpp - -SOURCEPATH ../mocks -SOURCE mock_cphoneringingtoneplayer.cpp -SOURCE mock_cphonettsplayer.cpp - -USERINCLUDE ../src -USERINCLUDE ../../../inc -USERINCLUDE ../../../../phoneuiqtviewadapter/inc -USERINCLUDE ../../../../phoneuicontrol/inc -USERINCLUDE ../../../../phoneuiutils/inc -USERINCLUDE ../../../../phoneui2/srcdata -USERINCLUDE ../../../../phonemediatorcenter/inc - -APP_LAYER_SYSTEMINCLUDE -SYSTEMINCLUDE /epoc32/include/digia/eunit -SYSTEMINCLUDE /epoc32/include/mda/client -SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE /epoc32/include/mmf/common -SYSTEMINCLUDE /epoc32/include/mmf/server -SYSTEMINCLUDE ../../../../../inc // phone internal headers - -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY symbianmock.lib -LIBRARY phoneuiutils.lib -LIBRARY euser.lib -LIBRARY efsrv.lib // TParse -LIBRARY ecom.lib // for CSFIUtilsPhoneInterface plugin -LIBRARY apgrfx.lib // Apa server -LIBRARY mediaclient.lib -LIBRARY mediaclientaudio.lib -LIBRARY drmhelper.lib -LIBRARY apmime.lib -LIBRARY caf.lib -LIBRARY charconv.lib // UTF-8 conversion for the TTS -LIBRARY featmgr.lib // FeatureManager -LIBRARY mediatorclient.lib -LIBRARY audiooutputrouting.lib // Ringingtone output -LIBRARY platformenv.lib // PathInfo -LIBRARY cone.lib - -EPOCALLOWDLLDATA - - -SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/mocks/mock_cphoneringingtoneplayer.cpp --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/mocks/mock_cphoneringingtoneplayer.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,383 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include "cphoneringingtone.h" -#include "cphoneringingtoneplayer.h" - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::CPhoneRingingtonePlayer -// ----------------------------------------------------------------------------- -// -CPhoneRingingtonePlayer::CPhoneRingingtonePlayer( ) - :CActive( CActive::EPriorityStandard ) - { - - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConstructL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructL( ) - { - - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::~CPhoneRingingtonePlayer -// ----------------------------------------------------------------------------- -// -CPhoneRingingtonePlayer::~CPhoneRingingtonePlayer( ) - { - - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::NewL -// ----------------------------------------------------------------------------- -// -CPhoneRingingtonePlayer * CPhoneRingingtonePlayer::NewL( ) - { - SMC_MOCK_NEWL0( CPhoneRingingtonePlayer * ) - - CPhoneRingingtonePlayer* self = new( ELeave ) CPhoneRingingtonePlayer; - CleanupStack::PushL( self ); - //self->ConstructL() - CleanupStack::Pop( self ); - return self; - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::PlayProfileBasedTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayProfileBasedTone( - CPhoneRingingTone * aAudioVideoRingingTone ) - { - SMC_MOCK_METHOD1( void, CPhoneRingingTone *, aAudioVideoRingingTone ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::PlayBeepOnce -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayBeepOnce( - TInt aVolume ) - { - SMC_MOCK_METHOD1( void, TInt, aVolume ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::PlaySilentTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlaySilentTone( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::PlayVideoRingingTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayVideoRingingTone( - const CPhoneRingingTone & aRingingTone, - TInt aVolume, - TProfileRingingType aRingingType, - TBool aPersonalTone ) - { - SMC_MOCK_METHOD4( void, const CPhoneRingingTone &, aRingingTone, - TInt, aVolume, - TProfileRingingType, aRingingType, - TBool, aPersonalTone ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::PlayDefaultTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayDefaultTone( - TInt aVolume, - TProfileRingingType aRingingType ) - { - SMC_MOCK_METHOD2( void, TInt, aVolume, - TProfileRingingType, aRingingType ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::PlayBackupTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::PlayBackupTone( - TInt aVolume, - TProfileRingingType aRingingType ) - { - SMC_MOCK_METHOD2( void, TInt, aVolume, - TProfileRingingType, aRingingType ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::StopPlaying -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::StopPlaying( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::GetCurrentlyActiveAudioPlayer -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer * CPhoneRingingtonePlayer::GetCurrentlyActiveAudioPlayer( ) - { - SMC_MOCK_METHOD0( CPhoneAudioPlayer * ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::MuteActiveAudioPlayer -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::MuteActiveAudioPlayer( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::HandleCenRepChangeL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleCenRepChangeL( - const TUid & aUid, - const TUint aId ) - { - EUNIT_LEAVE_POINT - SMC_MOCK_METHOD2( void, const TUid &, aUid, - const TUint, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::RunL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::RunL( ) - { - EUNIT_LEAVE_POINT - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::DoCancel -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::DoCancel( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::HandleAudioPlayerError -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleAudioPlayerError( - TPhoneAudioPlayerErrorEvent aEvent, - TInt aError, - TInt aId ) - { - SMC_MOCK_METHOD3( void, TPhoneAudioPlayerErrorEvent, aEvent, - TInt, aError, - TInt, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::HandleAudioPlayerInitComplete -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleAudioPlayerInitComplete( - TInt aId ) - { - SMC_MOCK_METHOD1( void, TInt, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::HandlePlayingComplete -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandlePlayingComplete( - TInt aId ) - { - SMC_MOCK_METHOD1( void, TInt, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::HandleTimeOutL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::HandleTimeOutL( ) - { - EUNIT_LEAVE_POINT - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::DeletePlayerAsync -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::DeletePlayerAsync( - TPlayerId aPlayer ) - { - SMC_MOCK_METHOD1( void, TPlayerId, aPlayer ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConstructSequencePlayer -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructSequencePlayer( - TPlayerId aPlayer ) - { - SMC_MOCK_METHOD1( void, TPlayerId, aPlayer ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConstructSequencePlayerL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructSequencePlayerL( - TPlayerId aPlayer ) - { - EUNIT_LEAVE_POINT - SMC_MOCK_METHOD1( void, TPlayerId, aPlayer ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConstructBackupPlayer -// ----------------------------------------------------------------------------- -// -TInt CPhoneRingingtonePlayer::ConstructBackupPlayer( ) - { - SMC_MOCK_METHOD0( TInt ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConstructBackupPlayerL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructBackupPlayerL( ) - { - EUNIT_LEAVE_POINT - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConstructDefaultPlayerL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::ConstructDefaultPlayerL( ) - { - EUNIT_LEAVE_POINT - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConstructTonePlayer -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer * CPhoneRingingtonePlayer::ConstructTonePlayer( - const CPhoneRingingTone & aRingingTone, - TInt aId ) - { - SMC_MOCK_METHOD2( CPhoneAudioPlayer *, const CPhoneRingingTone &, aRingingTone, - TInt, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConvertRingingType -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer::TRingingType CPhoneRingingtonePlayer::ConvertRingingType( - TProfileRingingType aRingingType ) - { - SMC_MOCK_METHOD1( CPhoneAudioPlayer::TRingingType, TProfileRingingType, aRingingType ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::ConvertVideoRingingType -// ----------------------------------------------------------------------------- -// -MPhoneVideoPlayer::TPlayMode CPhoneRingingtonePlayer::ConvertVideoRingingType( - TProfileRingingType aRingingType ) - { - SMC_MOCK_METHOD1( MPhoneVideoPlayer::TPlayMode, TProfileRingingType, aRingingType ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::CleanupPlayers -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::CleanupPlayers( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneRingingtonePlayer::DoHandlePlayerError -// ----------------------------------------------------------------------------- -// -void CPhoneRingingtonePlayer::DoHandlePlayerError( - TBool aDelete, - TBool aSync ) - { - SMC_MOCK_METHOD2( void, TBool, aDelete, - TBool, aSync ) - } - - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/mocks/mock_cphonettsplayer.cpp --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/mocks/mock_cphonettsplayer.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,205 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include "cphonettsplayer.h" -#include "cphoneringingtone.h" -#include "cphoneringingtoneplayer.h" - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::CPhoneTTSPlayer -// ----------------------------------------------------------------------------- -// -CPhoneTTSPlayer::CPhoneTTSPlayer( - CPhoneRingingtonePlayer * aRingingtonePlayer ) - { - - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::ConstructL -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::ConstructL( ) - { - - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::~CPhoneTTSPlayer -// ----------------------------------------------------------------------------- -// -CPhoneTTSPlayer::~CPhoneTTSPlayer( ) - { - - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::NewL -// ----------------------------------------------------------------------------- -// -CPhoneTTSPlayer * CPhoneTTSPlayer::NewL( - CPhoneRingingtonePlayer * aRingingtonePlayer ) - { - SMC_MOCK_NEWL1( CPhoneTTSPlayer *, CPhoneRingingtonePlayer *, aRingingtonePlayer ) - - CPhoneTTSPlayer* self = new( ELeave ) CPhoneTTSPlayer(aRingingtonePlayer); - CleanupStack::PushL( self ); - //self->ConstructL() - CleanupStack::Pop( self ); - return self; - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::PlayTtsTone -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::PlayTtsTone( - const TDesC & aTextToSay, - CPhoneRingingTone * aAudioVideoRingingTone ) - { - SMC_MOCK_METHOD2( void, const TDesC &, aTextToSay, - CPhoneRingingTone *, aAudioVideoRingingTone ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::StopPlaying -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::StopPlaying( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::AddTtsPlaybackIfNeeded -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::AddTtsPlaybackIfNeeded( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::HandleAudioPlayerError -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::HandleAudioPlayerError( - TPhoneAudioPlayerErrorEvent aEvent, - TInt aError, - TInt aId ) - { - SMC_MOCK_METHOD3( void, TPhoneAudioPlayerErrorEvent, aEvent, - TInt, aError, - TInt, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::HandleAudioPlayerInitComplete -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::HandleAudioPlayerInitComplete( - TInt aId ) - { - SMC_MOCK_METHOD1( void, TInt, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::HandlePlayingComplete -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::HandlePlayingComplete( - TInt aId ) - { - SMC_MOCK_METHOD1( void, TInt, aId ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::HandleTtsDelayTimeout -// ----------------------------------------------------------------------------- -// -TInt CPhoneTTSPlayer::HandleTtsDelayTimeout( - TAny * object ) - { - //SMC_MOCK_METHOD1( TInt, TAny *, object ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::DoHandleTtsDelayTimeout -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::DoHandleTtsDelayTimeout( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::GetCurrentlyActiveAudioPlayerWithTTs -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer * CPhoneTTSPlayer::GetCurrentlyActiveAudioPlayerWithTTs( ) - { - SMC_MOCK_METHOD0( CPhoneAudioPlayer * ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::SolveNewVolumeAndRamptime -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::SolveNewVolumeAndRamptime( - TTtsStatus aStatus ) - { - SMC_MOCK_METHOD1( void, TTtsStatus, aStatus ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::ReStartRingingTonePlayer -// ----------------------------------------------------------------------------- -// -void CPhoneTTSPlayer::ReStartRingingTonePlayer( ) - { - SMC_MOCK_METHOD0( void ) - } - - -// ----------------------------------------------------------------------------- -// CPhoneTTSPlayer::ConvertRingingType -// ----------------------------------------------------------------------------- -// -CPhoneAudioPlayer::TRingingType CPhoneTTSPlayer::ConvertRingingType( - TProfileRingingType aRingingType ) - { - SMC_MOCK_METHOD1( CPhoneAudioPlayer::TRingingType, TProfileRingingType, aRingingType ) - } - - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller.cpp --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,303 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include -#include -#include -#include -#include -#include "ut_cphoneringingtonecontroller.h" -#include "cphoneringingtonecontroller.h" -#include "tphonecmdparamringtone.h" -#include "cphoneringingtone.h" -#include "cphonecenrepproxy.h" - -_LIT(KNokiatune, "Z:\\Data\\Sounds\\Digital\\Nokia tune.aac"); - - - -// custom comparison method for matching expected and items -TBool operator==( const CPhoneRingingTone& aData1, - const CPhoneRingingTone& aData2 ) - { - return ( aData1.FileName() == aData2.FileName()&& - aData1.Volume() == aData2.Volume() && - aData1.RingingType() == aData2.RingingType()&& - aData1.TtsToneToBePlayed() == aData2.TtsToneToBePlayed()); - } - -// - Construction ----------------------------------------------------------- - -ut_cphoneringingtonecontroller* ut_cphoneringingtonecontroller::NewL() - { - ut_cphoneringingtonecontroller* self = ut_cphoneringingtonecontroller::NewLC(); - CleanupStack::Pop(); - return self; - } - -ut_cphoneringingtonecontroller* ut_cphoneringingtonecontroller::NewLC() - { - ut_cphoneringingtonecontroller* self = new( ELeave ) ut_cphoneringingtonecontroller(); - CleanupStack::PushL( self ); - self->ConstructL(); - return self; - } - -ut_cphoneringingtonecontroller::~ut_cphoneringingtonecontroller() - { - CSmcMockContext::Release(); - } - -ut_cphoneringingtonecontroller::ut_cphoneringingtonecontroller() - { - } - -void ut_cphoneringingtonecontroller::ConstructL() - { - CEUnitTestSuiteClass::ConstructL(); - iMockContext = CSmcMockContext::InstanceL(); - } - -// - Test methods ----------------------------------------------------------- - - - -void ut_cphoneringingtonecontroller::SetupL( ) - { - iMockContext->InitializeL(); - // need to be created here otherwise memory leak can be detected. - iPhoneCenRepProxy = CPhoneCenRepProxy::Instance(); - iRingingtoneplayer = CPhoneRingingToneController::NewL(); - } - - -void ut_cphoneringingtonecontroller::Teardown( ) - { - delete CPhoneCenRepProxy::Instance(); - UserSvr::DllFreeTls(KUidCenRepProxySingleton.iUid); - - delete iRingingtoneplayer; - iRingingtoneplayer = NULL; - iMockContext->Reset(); - } - - -void ut_cphoneringingtonecontroller::T_PlayRingingtoneRinging( ) - { - // Expected data - TBuf<50> ringingtone(KNokiatune); - _LIT8( KMethod, "CPhoneRingingtonePlayer::PlayProfileBasedTone" ); - CPhoneRingingTone* aAudioVideoRingingTone = CPhoneRingingTone::NewL(ringingtone); - aAudioVideoRingingTone->SetRingingType(EProfileRingingTypeRinging); - aAudioVideoRingingTone->SetTtsToneToBePlayed(EFalse); - aAudioVideoRingingTone->SetVolume(5); - iMockContext->ExpectCallL( KMethod() ).WithL(aAudioVideoRingingTone); - - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(5); - ringToneParam.SetRingingType(EProfileRingingTypeRinging); - // Set the profile ring tone - ringToneParam.SetRingTone( ringingtone ); - ringToneParam.SetType( EPhoneRingToneProfile ); - - iRingingtoneplayer->PlayRingToneL( &ringToneParam ); - - EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); - delete aAudioVideoRingingTone; - - } - -void ut_cphoneringingtonecontroller::T_PlayRingingtoneSilence( ) - { - _LIT8( KMethod, "CPhoneRingingtonePlayer::PlaySilentTone" ); - - iMockContext->ExpectCallL( KMethod() ); - - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(5); - ringToneParam.SetRingingType(EProfileRingingTypeSilent); - // Set the profile ring tone - TBuf<50> ringingtone(KNokiatune); - ringToneParam.SetRingTone( ringingtone ); - ringToneParam.SetType( EPhoneRingToneProfile ); - - iRingingtoneplayer->PlayRingToneL( &ringToneParam ); - - EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); - } - -void ut_cphoneringingtonecontroller::T_PlayRingingtoneBeepOnce( ) - { - _LIT8( KMethod, "CPhoneRingingtonePlayer::PlayBeepOnce" ); - iMockContext->ExpectCallL( KMethod() ).WithL(5); - - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(5); - ringToneParam.SetRingingType(EProfileRingingTypeBeepOnce); - // Set the profile ring tone - TBuf<50> ringingtone(KNokiatune); - ringToneParam.SetRingTone( ringingtone ); - ringToneParam.SetType( EPhoneRingToneProfile ); - - iRingingtoneplayer->PlayRingToneL( &ringToneParam ); - - EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); - } - -void ut_cphoneringingtonecontroller::T_PlayRingingtoneAscending( ) - { - TBuf<50> ringingtone(KNokiatune); - _LIT8( KMethod, "CPhoneRingingtonePlayer::PlayProfileBasedTone" ); - CPhoneRingingTone* aAudioVideoRingingTone = CPhoneRingingTone::NewL(ringingtone); - aAudioVideoRingingTone->SetRingingType(EProfileRingingTypeAscending); - aAudioVideoRingingTone->SetTtsToneToBePlayed(EFalse); - aAudioVideoRingingTone->SetVolume(5); - iMockContext->ExpectCallL( KMethod() ).WithL(aAudioVideoRingingTone); - - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(5); - ringToneParam.SetRingingType(EProfileRingingTypeAscending); - // Set the profile ring tone - ringToneParam.SetRingTone( ringingtone ); - ringToneParam.SetType( EPhoneRingToneProfile ); - - iRingingtoneplayer->PlayRingToneL( &ringToneParam ); - - EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); - delete aAudioVideoRingingTone; - } - -void ut_cphoneringingtonecontroller::T_PlayRingingtoneRingingOnce( ) - { - TBuf<50> ringingtone(KNokiatune); - _LIT8( KMethod, "CPhoneRingingtonePlayer::PlayProfileBasedTone" ); - CPhoneRingingTone* aAudioVideoRingingTone = CPhoneRingingTone::NewL(ringingtone); - aAudioVideoRingingTone->SetRingingType(EProfileRingingTypeRingingOnce); - aAudioVideoRingingTone->SetTtsToneToBePlayed(EFalse); - aAudioVideoRingingTone->SetVolume(5); - iMockContext->ExpectCallL( KMethod() ).WithL(aAudioVideoRingingTone); - - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(5); - ringToneParam.SetRingingType(EProfileRingingTypeRingingOnce); - // Set the profile ring tone - ringToneParam.SetRingTone( ringingtone ); - ringToneParam.SetType( EPhoneRingToneProfile ); - - iRingingtoneplayer->PlayRingToneL( &ringToneParam ); - - EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); - delete aAudioVideoRingingTone; - } - -void ut_cphoneringingtonecontroller::T_PlayRingingtoneTTS() -{ - // Expected data - _LIT(KTextToSay, "Mr. Brownstone"); - TBuf<30> texttosay (KTextToSay); - TBuf<50> ringingtone(KNokiatune); - CPhoneRingingTone* aAudioVideoRingingTone = CPhoneRingingTone::NewL(ringingtone); - aAudioVideoRingingTone->SetRingingType(EProfileRingingTypeRinging); - aAudioVideoRingingTone->SetTtsToneToBePlayed(ETrue); - aAudioVideoRingingTone->SetVolume(5); - _LIT8( KMethod, "CPhoneTTSPlayer::NewL" ); - iMockContext->ExpectCallL( KMethod() ); - _LIT8( KMethod2, "CPhoneTTSPlayer::PlayTtsTone" ); - iMockContext->ExpectCallL( KMethod2() ).WithL(KTextToSay(), aAudioVideoRingingTone); - _LIT8( KMethod3, "CPhoneRingingtonePlayer::PlayProfileBasedTone" ); - iMockContext->ExpectCallL( KMethod3() ).WithL(aAudioVideoRingingTone); - - TPhoneCmdParamRingTone ringToneParam; - ringToneParam.SetVolume(5); - ringToneParam.SetRingingType(EProfileRingingTypeRinging); - ringToneParam.SetTextToSay(texttosay); - // Set the profile ring tone - ringToneParam.SetRingTone( ringingtone); - ringToneParam.SetType( EPhoneRingToneProfile ); - - iRingingtoneplayer->PlayRingToneL( &ringToneParam ); - - EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); - delete aAudioVideoRingingTone; -} - -void ut_cphoneringingtonecontroller::T_StopRingingtone() -{ - _LIT8( KMethod, "CPhoneRingingtonePlayer::StopPlaying" ); - iMockContext->ExpectCallL( KMethod() ); - - iRingingtoneplayer->StopPlaying(); - EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); -} -// - EUnit test table ------------------------------------------------------- - -EUNIT_BEGIN_TEST_TABLE( - ut_cphoneringingtonecontroller, - "Add test suite description here.", - "UNIT" ) - -EUNIT_TEST( - "T_PlayRingingtoneRinging", - "", - "", - "FUNCTIONALITY", - SetupL, T_PlayRingingtoneRinging, Teardown) - -EUNIT_TEST( - "T_PlayRingingtoneSilence", - "", - "", - "FUNCTIONALITY", - SetupL, T_PlayRingingtoneSilence, Teardown) - -EUNIT_TEST( - "T_PlayRingingtoneBeepOnce", - "", - "", - "FUNCTIONALITY", - SetupL, T_PlayRingingtoneBeepOnce, Teardown) - -EUNIT_TEST( - "T_PlayRingingtoneAscending", - "", - "", - "FUNCTIONALITY", - SetupL, T_PlayRingingtoneAscending, Teardown) - -EUNIT_TEST( - "T_PlayRingingtoneAscending", - "", - "", - "FUNCTIONALITY", - SetupL, T_PlayRingingtoneRingingOnce, Teardown) - -EUNIT_TEST( - "T_PlayRingingtoneTTS", - "", - "", - "FUNCTIONALITY", - SetupL, T_PlayRingingtoneTTS, Teardown) - -EUNIT_TEST( - "T_StopRingingtone", - "", - "", - "FUNCTIONALITY", - SetupL, T_StopRingingtone, Teardown) -EUNIT_END_TEST_TABLE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller.h --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef __UT_CPHONERINGINGTONEPLAYER_H__ -#define __UT_CPHONERINGINGTONEPLAYER_H__ - -// INCLUDES -#include -#include - - -// FORWARD DECLARATIONS - -class CPhoneRingingToneController; -class CSmcMockContext; -class CPhoneRingingTone; -class CPhoneCenRepProxy; - - -// custom comparison method for matching expected and actual SData items -TBool operator==( const CPhoneRingingTone& aData1, const CPhoneRingingTone& aData2 ); -// CLASS DEFINITION -/** - * Generated EUnit test suite class. - */ -NONSHARABLE_CLASS( ut_cphoneringingtonecontroller ) - : public CEUnitTestSuiteClass - { - public: // Constructors and destructor - - static ut_cphoneringingtonecontroller* NewL(); - static ut_cphoneringingtonecontroller* NewLC(); - ~ut_cphoneringingtonecontroller(); - - private: // Constructors - - ut_cphoneringingtonecontroller(); - void ConstructL(); - - private: // New methods - - void SetupL(); - - void Teardown(); - - void T_PlayRingingtoneRinging(); - - void T_PlayRingingtoneSilence(); - - void T_PlayRingingtoneBeepOnce(); - - void T_PlayRingingtoneAscending(); - - void T_PlayRingingtoneRingingOnce(); - - void T_PlayRingingtoneTTS(); - - void T_StopRingingtone(); - - - private: // Data - - CPhoneRingingToneController* iRingingtoneplayer; - CPhoneCenRepProxy* iPhoneCenRepProxy; - CSmcMockContext* iMockContext; - - EUNIT_DECLARE_TEST_TABLE; - - }; - -#endif // __UT_CPHONERINGINGTONEPLAYER_H__ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller_dllmain.cpp --- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller_dllmain.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include "ut_cphoneringingtonecontroller.h" -#include - -EXPORT_C MEUnitTest* CreateTestSuiteL() - { - return ut_cphoneringingtonecontroller::NewL(); - } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phonestringloader/src/stringloader.cpp --- a/phoneapp/phonestringloader/src/stringloader.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phonestringloader/src/stringloader.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -18,22 +18,10 @@ #include // must be before e32base.h so uncaught_exception gets defined #include #include "phoneresourceadapter.h" -#include "phoneaction.h" // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- -// StringLoader::StringLoader -// ----------------------------------------------------------------------------- -// -/* -StringLoader::StringLoader( ) - { - - } -*/ - -// ----------------------------------------------------------------------------- // StringLoader::Load // ----------------------------------------------------------------------------- // @@ -43,12 +31,8 @@ CCoeEnv * aLoaderEnv ) { Q_UNUSED (aLoaderEnv); - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - aDest.Copy (text->text ().utf16 ()); - delete text; - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId); + aDest.Copy(text.utf16()); } // ----------------------------------------------------------------------------- @@ -59,19 +43,8 @@ TInt aResourceId, CCoeEnv * aLoaderEnv ) { - Q_UNUSED (aLoaderEnv); - HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewL (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::New (1); - } + HBufC *buf = LoadLC(aResourceId, aLoaderEnv); + CleanupStack::Pop(buf); return buf; } @@ -85,19 +58,8 @@ TInt aInt, CCoeEnv * aLoaderEnv ) { - Q_UNUSED (aLoaderEnv); - HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, aInt); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewL (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::New (1); - } + HBufC *buf = LoadLC(aResourceId, aInt, aLoaderEnv); + CleanupStack::Pop(buf); return buf; } @@ -111,19 +73,8 @@ const TDesC & aString, CCoeEnv * aLoaderEnv ) { - Q_UNUSED (aLoaderEnv); - HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aString); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewL (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::New (1); - } + HBufC *buf = LoadLC(aResourceId, aString, aLoaderEnv); + CleanupStack::Pop(buf); return buf; } @@ -138,19 +89,8 @@ TInt aInt, CCoeEnv * aLoaderEnv ) { - Q_UNUSED (aLoaderEnv); - HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aString, aInt); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewL (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::New (1); - } + HBufC *buf = LoadLC(aResourceId, aString, aInt, aLoaderEnv); + CleanupStack::Pop(buf); return buf; } @@ -164,19 +104,8 @@ const CArrayFix & aInts, CCoeEnv * aLoaderEnv ) { - Q_UNUSED (aLoaderEnv); - HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aInts); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewL (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::New (1); - } + HBufC *buf = LoadLC(aResourceId, aInts, aLoaderEnv); + CleanupStack::Pop(buf); return buf; } @@ -190,19 +119,8 @@ const MDesCArray & aStrings, CCoeEnv * aLoaderEnv ) { - Q_UNUSED (aLoaderEnv); - HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aStrings); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewL (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::New (1); - } + HBufC *buf = LoadLC(aResourceId, aStrings, aLoaderEnv); + CleanupStack::Pop(buf); return buf; } @@ -217,19 +135,8 @@ const CArrayFix & aInts, CCoeEnv * aLoaderEnv ) { - Q_UNUSED (aLoaderEnv); - HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aStrings, &aInts); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewL (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::New (1); - } + HBufC *buf = LoadLC(aResourceId, aStrings, aInts, aLoaderEnv); + CleanupStack::Pop(buf); return buf; } @@ -244,17 +151,9 @@ { Q_UNUSED (aLoaderEnv); HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewLC (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::NewLC (1); - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId); + buf = HBufC::NewLC(text.size()); + *buf = text.utf16(); return buf; } @@ -270,17 +169,9 @@ { Q_UNUSED (aLoaderEnv); HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, aInt); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewLC (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::NewLC (1); - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId, aInt); + buf = HBufC::NewLC(text.size()); + *buf = text.utf16(); return buf; } @@ -296,17 +187,9 @@ { Q_UNUSED (aLoaderEnv); HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aString); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewLC (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::NewLC (1); - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId, &aString); + buf = HBufC::NewLC(text.size()); + *buf = text.utf16(); return buf; } @@ -323,17 +206,9 @@ { Q_UNUSED (aLoaderEnv); HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aString, aInt); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewLC (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::NewLC (1); - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId, &aString, aInt); + buf = HBufC::NewLC(text.size()); + *buf = text.utf16(); return buf; } @@ -350,17 +225,9 @@ { Q_UNUSED (aLoaderEnv); HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aInts); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewLC (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::NewLC (1); - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId, &aInts); + buf = HBufC::NewLC(text.size()); + *buf = text.utf16(); return buf; } @@ -376,17 +243,9 @@ { Q_UNUSED (aLoaderEnv); HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aStrings); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewLC (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::NewLC (1); - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId, &aStrings); + buf = HBufC::NewLC(text.size()); + *buf = text.utf16(); return buf; } @@ -403,16 +262,8 @@ { Q_UNUSED (aLoaderEnv); HBufC *buf; - QMap map = PhoneResourceAdapter::Instance ()->convert (aResourceId, &aStrings, &aInts); - if (map.contains (PhoneAction::Text)) { - PhoneAction *text = map [PhoneAction::Text]; - buf = HBufC::NewLC (text->text ().size ()); - *buf = text->text ().utf16 (); - delete text; - } else { - // TODO: this else branch MUST be removed after all strings are localized! - // now here only to prevent crashing - buf = HBufC::NewLC (1); - } + QString text = PhoneResourceAdapter::Instance()->convert(aResourceId, &aStrings, &aInts); + buf = HBufC::NewLC(text.size()); + *buf = text.utf16(); return buf; } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phonestringloader/tsrc/ut_phonestringloader/phoneresourceadapter.h --- a/phoneapp/phonestringloader/tsrc/ut_phonestringloader/phoneresourceadapter.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phonestringloader/tsrc/ut_phonestringloader/phoneresourceadapter.h Fri Oct 15 12:58:46 2010 +0300 @@ -17,7 +17,6 @@ #include #include -#include "phoneaction.h" #ifndef PHONERESOURCEADAPTER_H #define PHONERESOURCEADAPTER_H @@ -27,7 +26,7 @@ Q_OBJECT public: static PhoneResourceAdapter* Instance(QObject *parent = 0); - QMap convert (int symbianResourceId, ...); + QString convert (int symbianResourceId, ...); }; #endif diff -r cfea66083b62 -r baacf668fe89 phoneapp/phonestringloader/tsrc/ut_phonestringloader/unit_tests.cpp --- a/phoneapp/phonestringloader/tsrc/ut_phonestringloader/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phonestringloader/tsrc/ut_phonestringloader/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -21,7 +21,6 @@ #include //#include #include -#include "phoneaction.h" #include "phoneresourceadapter.h" class TestPhoneStringLoader : public QObject @@ -70,18 +69,16 @@ return m_resource_adapter; } -QMap PhoneResourceAdapter::convert (int symbianResourceId, ...) +QString PhoneResourceAdapter::convert (int symbianResourceId, ...) { m_resourceId = symbianResourceId; m_convertCalled = true; - QMap map; + QString ret = ""; if (m_set_text_map) { - PhoneAction *text = new PhoneAction; - text->setText(tr("Test")); - map[PhoneAction::Text] = text; + ret = tr("Test"); } - - return map; + + return ret; } TestPhoneStringLoader::TestPhoneStringLoader () diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/inc/hbphonemainwindow.h --- a/phoneapp/phoneui2/inc/hbphonemainwindow.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +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: Main window for PhoneUI -* -*/ - - -#ifndef HBPHONEMAINWINDOW_H_ -#define HBPHONEMAINWINDOW_H_ - -#include -#include - -class PhoneUiHouseHold; - -class HbPhoneMainWindow: public HbMainWindow - { - Q_OBJECT -public: - - HbPhoneMainWindow(QWidget* parent = 0); - ~HbPhoneMainWindow(); - -signals: - void focusLost(); - void focusGained(); - -public slots: - void onFocusLost(); - void onFocusGained(); - - -private: // data - PhoneUiHouseHold* mHouseHold; - - - }; - - - -#endif /* HBPHONEMAINVIEW_H_ */ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/inc/phonemainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneui2/inc/phonemainwindow.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,56 @@ +/* +* 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: Main window for PhoneUI +* +*/ + + +#ifndef HBPHONEMAINWINDOW_H_ +#define HBPHONEMAINWINDOW_H_ + +#include +#include + +class PhoneUiHouseHold; + +class PhoneMainWindow: public HbMainWindow + { + Q_OBJECT +public: + + PhoneMainWindow(QWidget* parent = 0); + ~PhoneMainWindow(); + void ReloadTranslations(); + +signals: + void focusLost(); + void focusGained(); + +public slots: + void onFocusLost(); + void onFocusGained(); + +protected: + void changeEvent(QEvent *event); + + +private: // data + PhoneUiHouseHold* mHouseHold; + + + }; + + + +#endif /* HBPHONEMAINVIEW_H_ */ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/inc/phoneuihousehold.h --- a/phoneapp/phoneui2/inc/phoneuihousehold.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/inc/phoneuihousehold.h Fri Oct 15 12:58:46 2010 +0300 @@ -29,6 +29,7 @@ PhoneUiHouseHold (HbMainWindow &window); ~PhoneUiHouseHold (); + void reloadTranslators(); private: PhoneUiHouseHoldPrivate* mHouseHoldPrivate; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/inc/phoneuihousehold_p.h --- a/phoneapp/phoneui2/inc/phoneuihousehold_p.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/inc/phoneuihousehold_p.h Fri Oct 15 12:58:46 2010 +0300 @@ -71,13 +71,20 @@ const TUint aKey, const TInt aValue ); + /** + * Creates new translators, loads translation files for current language + */ + void loadTranslators(); + private: /** * Constructor */ void ConstructL(); - + + void resetTranslators(); + private: // Startup states. // EPhoneStartupInitial - Initial state. @@ -97,8 +104,8 @@ // Recovery id for startup signalling. TRecoveryId iStartupSignalRecoveryId; - //Boolean flag. ETrue iff we have reached light idle - TBool iLightIdleReached; + //Boolean flag. True if we have reached light idle + bool iLightIdleReached; CPhoneUIController* iPhoneUIController; @@ -113,6 +120,8 @@ //List for translators QList m_translators; + bool m_featMgrInit; + }; #endif diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/phoneui2.pro --- a/phoneapp/phoneui2/phoneui2.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/phoneui2.pro Fri Oct 15 12:58:46 2010 +0300 @@ -26,7 +26,7 @@ TARGET.CAPABILITY = ALL -TCB TARGET.UID3 = 0x100058B3 TARGET.VID = VID_DEFAULT - TARGET.EPOCHEAPSIZE = 0x1000 0xA00000 + TARGET.EPOCHEAPSIZE = 0x1000 0xA00000 // codescanner::largeepocheapsizevalues DEFINES += FT_SYMBIAN_INTEGRATION VERSION = 10.0 @@ -57,7 +57,7 @@ RSS_RULES += "hidden = KAppIsHidden;" } -HEADERS += ./inc/hbphonemainwindow.h \ +HEADERS += ./inc/phonemainwindow.h \ ./inc/phoneuikeyeventadapter.h \ ./inc/phoneuicommandadapter.h \ ./inc/phoneuihousehold.h \ @@ -67,7 +67,7 @@ SOURCES += ./src/main.cpp \ ./src/phoneuikeyeventadapter.cpp \ ./src/phoneuicommandadapter.cpp \ - ./src/hbphonemainwindow.cpp \ + ./src/phonemainwindow.cpp \ ./src/phoneuihousehold.cpp \ ./src/phoneuihousehold_p.cpp \ ./src/phoneapplication.cpp diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/src/hbphonemainwindow.cpp --- a/phoneapp/phoneui2/src/hbphonemainwindow.cpp Mon Oct 04 16:06:10 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: Main window class. -* -*/ - -#include "hbphonemainwindow.h" -#include "phoneuihousehold.h" - -HbPhoneMainWindow::HbPhoneMainWindow(QWidget *parent): - HbMainWindow(parent) -{ - mHouseHold = new PhoneUiHouseHold (*this); -} - -HbPhoneMainWindow::~HbPhoneMainWindow () -{ - delete mHouseHold; -} - -void HbPhoneMainWindow::onFocusLost() -{ - emit focusLost(); -} -void HbPhoneMainWindow::onFocusGained() -{ - emit focusGained(); -} - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/src/main.cpp --- a/phoneapp/phoneui2/src/main.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/src/main.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -21,14 +21,14 @@ #include #include -#include "hbphonemainwindow.h" +#include "phonemainwindow.h" #include "phoneapplication.h" int main (int argc, char *argv[]) { PhoneApplication app(argc, argv, Hb::NoSplash); - HbPhoneMainWindow window; + PhoneMainWindow window; QObject::connect(&app,SIGNAL(focusLost()),&window,SLOT(onFocusLost())); QObject::connect(&app,SIGNAL(focusGained()),&window,SLOT(onFocusGained())); XQServiceUtil::toBackground( true ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/src/phoneapplication.cpp --- a/phoneapp/phoneui2/src/phoneapplication.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/src/phoneapplication.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -37,7 +37,7 @@ const TWsEvent *wsevent = event->windowServerEvent(); if ( wsevent->Type() == EEventWindowVisibilityChanged ){ TUint visible = wsevent->VisibilityChanged()->iFlags; - if ( visible & TWsVisibilityChangedEvent::EFullyVisible ){ + if ( visible & TWsVisibilityChangedEvent::EPartiallyVisible ){ emit focusGained(); }else if (visible & TWsVisibilityChangedEvent::ENotVisible){ emit focusLost(); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/src/phonemainwindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneui2/src/phonemainwindow.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,52 @@ +/* +* 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: Main window class. +* +*/ + +#include +#include "phonemainwindow.h" +#include "phoneuihousehold.h" + +#include "qtphonelog.h" + +PhoneMainWindow::PhoneMainWindow(QWidget *parent): + HbMainWindow(parent) +{ + mHouseHold = new PhoneUiHouseHold (*this); +} + +PhoneMainWindow::~PhoneMainWindow () +{ + delete mHouseHold; +} + +void PhoneMainWindow::onFocusLost() +{ + emit focusLost(); +} +void PhoneMainWindow::onFocusGained() +{ + emit focusGained(); +} + +void PhoneMainWindow::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LocaleChange) { + PHONE_DEBUG("PhoneMainWindow::changeEvent, language changed"); + mHouseHold->reloadTranslators(); + } + HbMainWindow::changeEvent(event); +} + diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/src/phoneuihousehold.cpp --- a/phoneapp/phoneui2/src/phoneuihousehold.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/src/phoneuihousehold.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -28,3 +28,7 @@ delete mHouseHoldPrivate; } +void PhoneUiHouseHold::reloadTranslators() +{ + mHouseHoldPrivate->loadTranslators(); +} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/src/phoneuihousehold_p.cpp --- a/phoneapp/phoneui2/src/phoneuihousehold_p.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/src/phoneuihousehold_p.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -41,26 +41,24 @@ PhoneUiHouseHoldPrivate::PhoneUiHouseHoldPrivate(HbMainWindow &window) : iAppsReady (0), iStartupSignalRecoveryId (0), iLightIdleReached (EFalse), - iPhoneUIController (0), m_window (window) + iPhoneUIController (0), m_window (window), m_featMgrInit(false) { PHONE_DEBUG("phoneui - Start phoneapp"); - TRAPD( error, ConstructL() ); - qt_symbian_throwIfError(error); + QT_TRAP_THROWING( ConstructL() ); } PhoneUiHouseHoldPrivate::~PhoneUiHouseHoldPrivate() { - while (!m_translators.isEmpty()) { - HbTranslator *translator = m_translators.takeFirst(); - delete translator; - translator = 0; - } - + resetTranslators(); + delete iKeyEventAdapter; delete iCommandAdapter; delete iPhoneUIController; delete iViewAdapter; + if (m_featMgrInit) { + FeatureManager::UnInitializeLib(); + } } TInt PhoneUiHouseHoldPrivate::DoStartupSignalL( TAny* aAny ) @@ -74,21 +72,16 @@ appUi->DoStartupSignalSecurityL(); } - TInt PhoneUiHouseHoldPrivate::DoStartupSignalIdleL() { PHONE_DEBUG("phoneui::DoStartupSignalIdleL()"); + //Workaround: pre-load libs + m_window.show(); // Idle application has already started if ( !( iAppsReady & EPhoneIdleStartedUp ) ) { PHONE_DEBUG("phoneui::DoStartupSignalIdleL() Idle App started "); iAppsReady += EPhoneIdleStartedUp; - - // Remove Phone application from Fast Swap Window. - // iPhoneViewController->SetHiddenL( ETrue ); - - // Avkon removal - // hack to make sure EPhonePhase1Ok is set - to be fixed properly PHONE_DEBUG("phoneui::DoStartupSignalIdleL() Phone and Idle apps have both been started"); CPhonePubSubProxy::Instance()->ChangePropertyValue( @@ -124,8 +117,7 @@ { PHONE_DEBUG("phoneui::HandlePropertyChangedL()"); - if ( aCategory == KPSUidStartup ) - { + if ( aCategory == KPSUidStartup ){ const TInt startupState = CPhonePubSubProxy::Instance()->Value( KPSUidStartup, @@ -137,34 +129,24 @@ startupState == ESwStateEmergencyCallsOnly || startupState == ESwStateNormalRfOn || startupState == ESwStateNormalRfOff || - startupState == ESwStateNormalBTSap ) - { + startupState == ESwStateNormalBTSap ){ PHONE_DEBUG("phoneui::HandlePropertyChangedL() Try to update the startup signal again..." ); // Try to update the startup signal again CPhoneRecoverySystem::Instance()->RecoverNow( iStartupSignalRecoveryId, CTeleRecoverySystem::EPhonePriorityHigh ); - } } + } } void PhoneUiHouseHoldPrivate::ConstructL() { new( ELeave ) CPhoneLogger( KUidPhoneUILoggerSingleton ); FeatureManager::InitializeLibL(); + m_featMgrInit = true; - HbTranslator *translator = new HbTranslator(QString("telephone")); - - if (translator) { - translator->loadCommon(); - m_translators.append(translator); - } + loadTranslators(); - HbTranslator *translator2 = new HbTranslator(QString("telephone_cp")); - if (translator2) { - m_translators.append(translator2); - } - PhoneUIQtView *view = new PhoneUIQtView(m_window); iViewAdapter = new PhoneUIQtViewAdapter(*view); iPhoneUIController = CPhoneUIController::NewL(iViewAdapter); @@ -188,12 +170,6 @@ QObject::connect(iViewAdapter->noteController(), SIGNAL(command (int)), iCommandAdapter, SLOT(handleCommand (int))); - // Disable default Send key functionality in application framework - // avkon removal -// CAknAppUi *appUi = static_cast(CEikonEnv::Static()->AppUi()); -// appUi->SetKeyEventFlags( CAknAppUiBase::EDisableSendKeyShort | -// CAknAppUiBase::EDisableSendKeyLong ); - // CLI Name. TInt err = RProperty::Define( KPSUidTelRemotePartyInformation, @@ -315,3 +291,28 @@ } } +void PhoneUiHouseHoldPrivate::loadTranslators() +{ + PHONE_DEBUG2("PhoneUiHouseHoldPrivate::LoadTranslators, locale:", QLocale::system().name()); + resetTranslators(); + + HbTranslator *translator2 = new HbTranslator(QString("telephone_cp")); + if (translator2) { + m_translators.append(translator2); + } + + HbTranslator *translator = new HbTranslator(QString("telephone")); + if (translator) { + translator->loadCommon(); + m_translators.append(translator); //most used translation file added last + } +} + +void PhoneUiHouseHoldPrivate::resetTranslators() +{ + while (!m_translators.isEmpty()) { + HbTranslator *translator = m_translators.takeFirst(); + delete translator; + translator = 0; + } +} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.cpp --- a/phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -19,8 +19,10 @@ #include #include #include -#include "hbphonemainwindow.h" +#include "phonemainwindow.h" +#include "phoneuihousehold.h" +void PhoneUiHouseHold::reloadTranslators() {} class U_PhoneMainWindow: public QObject { @@ -37,7 +39,7 @@ private: - HbPhoneMainWindow* m_Window; // widget under test + PhoneMainWindow* m_Window; // widget under test }; @@ -52,7 +54,7 @@ void U_PhoneMainWindow::initTestCase() { - m_Window = new HbPhoneMainWindow(); + m_Window = new PhoneMainWindow(); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.pro --- a/phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.pro Fri Oct 15 12:58:46 2010 +0300 @@ -21,26 +21,21 @@ TARGET = DEPENDPATH += . INCLUDEPATH += . -INCLUDEPATH += ..\..\src +INCLUDEPATH += ../../src +INCLUDEPATH += ../../../../inc # Input -HEADERS += ..\..\inc\phoneuihousehold.h -HEADERS += ..\..\inc\hbphonemainwindow.h +HEADERS += ../../inc/phoneuihousehold.h +HEADERS += ../../inc/phonemainwindow.h SOURCES += phoneuihousehold_stub.cpp SOURCES += hbmainwindow_stub.cpp SOURCES += ut_phonemainwindow.cpp -SOURCES += ..\..\src\hbphonemainwindow.cpp - - - -TARGET.CAPABILITY = ALL -TCB +SOURCES += ../../src/phonemainwindow.cpp - - - - - -symbian:MMP_RULES += SMPSAFE +symbian { + TARGET.CAPABILITY = ALL -TCB + MMP_RULES += SMPSAFE +} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def --- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Fri Oct 15 12:58:46 2010 +0300 @@ -22,130 +22,135 @@ ?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@1@W4TDialInitiationMethod@1@@Z @ 21 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum CPhoneStateIdle::TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod) ?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 22 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int) ?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 23 NONAME ; void CPhoneStateIdle::HandleDialingL(int) - ?ClearNumberEntryContentCacheIfContentStored@CPhoneNumberEntryManager@@QAEXXZ @ 24 NONAME ; void CPhoneNumberEntryManager::ClearNumberEntryContentCacheIfContentStored(void) - ?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 25 NONAME ; void CPhoneStateMachine::ChangeState(int) - ?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 26 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void) - ?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 27 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int) - ?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 28 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void) - ?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 29 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 30 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) - ?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 31 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void) - ?RemoveNumberEntryIfVisibilityIsFalseL@CPhoneNumberEntryManager@@QAEXXZ @ 32 NONAME ; void CPhoneNumberEntryManager::RemoveNumberEntryIfVisibilityIsFalseL(void) - ?IsNumberEntryContentStored@CPhoneNumberEntryManager@@QAEHXZ @ 33 NONAME ; int CPhoneNumberEntryManager::IsNumberEntryContentStored(void) - ?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 34 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void) - ?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) - ?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) + ?DialMultimediaCall@CPhoneState@@IAEXXZ @ 24 NONAME ; void CPhoneState::DialMultimediaCall(void) + ?ClearNumberEntryContentCacheIfContentStored@CPhoneNumberEntryManager@@QAEXXZ @ 25 NONAME ; void CPhoneNumberEntryManager::ClearNumberEntryContentCacheIfContentStored(void) + ?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 26 NONAME ; void CPhoneStateMachine::ChangeState(int) + ?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 27 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void) + ?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 28 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int) + ?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 29 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void) + ?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 30 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 31 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) + ?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 32 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void) + ?RemoveNumberEntryIfVisibilityIsFalseL@CPhoneNumberEntryManager@@QAEXXZ @ 33 NONAME ; void CPhoneNumberEntryManager::RemoveNumberEntryIfVisibilityIsFalseL(void) + ?IsNumberEntryContentStored@CPhoneNumberEntryManager@@QAEHXZ @ 34 NONAME ; int CPhoneNumberEntryManager::IsNumberEntryContentStored(void) + ?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 35 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void) + ?NumberEntryClearL@CPhoneNumberEntryManager@@QBEXXZ @ 36 NONAME ; void CPhoneNumberEntryManager::NumberEntryClearL(void) const + ?DisconnectCallL@CPhoneState@@IAEHXZ @ 37 NONAME ; int CPhoneState::DisconnectCallL(void) + ?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 38 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(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 *) + ?CheckIfCallExists@PhoneCallUtil@@SAHIW4TPECallType@@@Z @ 46 NONAME ; int PhoneCallUtil::CheckIfCallExists(unsigned int, enum TPECallType) + ?IsSimOk@CPhoneState@@QAEHXZ @ 47 NONAME ; int CPhoneState::IsSimOk(void) + ?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 48 NONAME ; int CPhoneStateIdle::HandleCommandL(int) + ?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 49 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void) + ?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 50 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void) + ?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 51 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void) + ??1CPhoneStateInCall@@UAE@XZ @ 52 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void) + ?DialMultimediaCall@PhoneCallUtil@@SAXXZ @ 53 NONAME ; void PhoneCallUtil::DialMultimediaCall(void) + ?IsAnyConnectedCalls@PhoneCallUtil@@SAHXZ @ 54 NONAME ; int PhoneCallUtil::IsAnyConnectedCalls(void) + ?ConstructL@CPhoneStateInCall@@MAEXXZ @ 55 NONAME ; void CPhoneStateInCall::ConstructL(void) + ?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 56 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &) + ?ClearNumberEntryContentCache@CPhoneNumberEntryManager@@QAEXXZ @ 57 NONAME ; void CPhoneNumberEntryManager::ClearNumberEntryContentCache(void) + ?IsCustomizedDialerVisibleL@CPhoneNumberEntryManager@@QBEHXZ @ 58 NONAME ; int CPhoneNumberEntryManager::IsCustomizedDialerVisibleL(void) const + ?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 59 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode) + ?EikonEnv@CPhoneStateMachine@@QBEPAVCEikonEnv@@XZ @ 60 NONAME ; class CEikonEnv * CPhoneStateMachine::EikonEnv(void) const + ?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 61 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int) + ?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) + ?UpdateCallHeaderAndUiCommandsL@CPhoneState@@IAEXH@Z @ 73 NONAME ; void CPhoneState::UpdateCallHeaderAndUiCommandsL(int) + ?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) + ?DisconnectCallL@PhoneCallUtil@@SAHXZ @ 78 NONAME ; int PhoneCallUtil::DisconnectCallL(void) + ?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 79 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void) + ?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 80 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void) + ?StateMachine@CPhoneStateHandle@@QAEPAVMPhoneStateMachine@@XZ @ 81 NONAME ; class MPhoneStateMachine * CPhoneStateHandle::StateMachine(void) + ?EndUiUpdate@CPhoneState@@IAEXXZ @ 82 NONAME ; void CPhoneState::EndUiUpdate(void) + ?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 83 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) + ?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 84 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int) + ?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 85 NONAME ; void CPhoneState::BeginUiUpdateLC(void) + ?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 86 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void) + ?ProcessCommandL@CPhoneState@@UAEHH@Z @ 87 NONAME ; int CPhoneState::ProcessCommandL(int) + ?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 88 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void) + ?DialVoiceCallL@PhoneCallUtil@@SAXXZ @ 89 NONAME ; void PhoneCallUtil::DialVoiceCallL(void) + ??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 90 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 91 NONAME ; void CPhoneStateMachine::SetCallId(int) + ?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 92 NONAME ; int CPhoneUIController::ProcessCommandL(int) + ?DisplayCallHeaderL@CPhoneState@@QAEXHW4TNumberEntrySetRule@1@@Z @ 93 NONAME ; void CPhoneState::DisplayCallHeaderL(int, enum CPhoneState::TNumberEntrySetRule) + ??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 94 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 95 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int) + ?IsNumberEntryVisibleL@CPhoneNumberEntryManager@@QBEHXZ @ 96 NONAME ; int CPhoneNumberEntryManager::IsNumberEntryVisibleL(void) const + ??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 97 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 98 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 99 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode) + ?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 100 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) + ?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 101 NONAME ; int CPhoneUIController::HandleCommandL(int) + ?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 102 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void) + ?SetNumberEntryVisibilityL@CPhoneNumberEntryManager@@QAEXH@Z @ 103 NONAME ; void CPhoneNumberEntryManager::SetNumberEntryVisibilityL(int) + ?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 104 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int) + ?PhoneStorage@CPhoneStateMachine@@UAEPAVMPhoneStorage@@XZ @ 105 NONAME ; class MPhoneStorage * CPhoneStateMachine::PhoneStorage(void) + ??1CPhoneState@@UAE@XZ @ 106 NONAME ; CPhoneState::~CPhoneState(void) + ?DialVoiceCallL@CPhoneState@@QAEXXZ @ 107 NONAME ; void CPhoneState::DialVoiceCallL(void) + ?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 108 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int) + ?IsVideoCall@PhoneCallUtil@@SAHH@Z @ 109 NONAME ; int PhoneCallUtil::IsVideoCall(int) + ??1CPhoneStateMachine@@UAE@XZ @ 110 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void) + ?SetVisibilityIfNumberEntryUsedL@CPhoneNumberEntryManager@@QAEHH@Z @ 111 NONAME ; int CPhoneNumberEntryManager::SetVisibilityIfNumberEntryUsedL(int) + ?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 112 NONAME ; void CPhoneStateCallSetup::ConstructL(void) + ?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 113 NONAME ; void CPhoneUIController::HandleMessage(int, int) + ?ConstructL@CPhoneStateStartup@@MAEXXZ @ 114 NONAME ; void CPhoneStateStartup::ConstructL(void) + ?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 115 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) + ?ShowNoteL@CPhoneState@@IAEXH@Z @ 116 NONAME ; void CPhoneState::ShowNoteL(int) + ?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 117 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int) + ?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 118 NONAME ; class MPhoneState * CPhoneStateMachine::State(void) + ?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 119 NONAME ; void CPhoneState::SetHandsfreeModeL(int) + ?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 120 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const + ?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 121 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void) + ?PhoneNumberFromEntryLC@CPhoneNumberEntryManager@@QBEPAVHBufC16@@XZ @ 122 NONAME ; class HBufC16 * CPhoneNumberEntryManager::PhoneNumberFromEntryLC(void) const + ??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 123 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ??1CPhoneStateIncoming@@UAE@XZ @ 124 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void) + ?SendGlobalInfoNoteL@CPhoneState@@QAEXHH@Z @ 125 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int, int) + ?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 126 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void) + ?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 127 NONAME ; int CPhoneStateIdle::ProcessCommandL(int) + ?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 128 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int) + ?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 129 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 130 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 131 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void) + ?ConstructL@CPhoneStateIdle@@MAEXXZ @ 132 NONAME ; void CPhoneStateIdle::ConstructL(void) + ?SetEikonEnv@CPhoneState@@UAEXPAVCEikonEnv@@@Z @ 133 NONAME ; void CPhoneState::SetEikonEnv(class CEikonEnv *) + ?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 134 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void) + ?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 135 NONAME ; void CPhoneState::StartShowSecurityNoteL(void) + ?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 136 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int) + ?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 137 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int) + ?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 138 NONAME ; void CPhoneState::SetDefaultFlagsL(void) + ?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 139 NONAME ; int CPhoneStateInCall::HandleCommandL(int) + ?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 140 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void) + ?EikonEnv@CPhoneState@@QBEPAVCEikonEnv@@XZ @ 141 NONAME ; class CEikonEnv * CPhoneState::EikonEnv(void) const + ?UpdateCallHeader@CPhoneState@@IAEXH@Z @ 142 NONAME ; void CPhoneState::UpdateCallHeader(int) + ?SetBackButtonActive@CPhoneState@@IAEXH@Z @ 143 NONAME ; void CPhoneState::SetBackButtonActive(int) + ?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 144 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int) + ??1CPhoneStateIdle@@UAE@XZ @ 145 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void) + ?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 146 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) + ?BaseConstructL@CPhoneState@@QAEXXZ @ 147 NONAME ; void CPhoneState::BaseConstructL(void) + ?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 148 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void) + ?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 149 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *) + ??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 150 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *) + ?CallIdByState@PhoneCallUtil@@SAHI@Z @ 151 NONAME ; int PhoneCallUtil::CallIdByState(unsigned int) + ??1CPhoneStateStartup@@UAE@XZ @ 152 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void) + ?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 153 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) + ?OpenSoftRejectMessageEditorL@CPhoneState@@MAEXXZ @ 154 NONAME ; void CPhoneState::OpenSoftRejectMessageEditorL(void) diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def --- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Fri Oct 15 12:58:46 2010 +0300 @@ -17,9 +17,9 @@ _ZN11CPhoneState16UpdateUiCommandsEv @ 16 NONAME _ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 17 NONAME _ZN11CPhoneState17SetHandsfreeModeLEi @ 18 NONAME - _ZN11CPhoneState18DisplayCallHeaderLEiNS_19TNumberEntrySetRuleE @ 19 NONAME - _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 20 NONAME - _ZN11CPhoneState19DialMultimediaCallLEv @ 21 NONAME + _ZN11CPhoneState18DialMultimediaCallEv @ 19 NONAME + _ZN11CPhoneState18DisplayCallHeaderLEiNS_19TNumberEntrySetRuleE @ 20 NONAME + _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 21 NONAME _ZN11CPhoneState19HandlePhoneStartupLEv @ 22 NONAME _ZN11CPhoneState19SendGlobalInfoNoteLEii @ 23 NONAME _ZN11CPhoneState19SetBTHandsfreeModeLEi @ 24 NONAME @@ -54,269 +54,274 @@ _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 - _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 + _ZN13PhoneCallUtil11IsVideoCallEi @ 56 NONAME + _ZN13PhoneCallUtil13CallIdByStateEj @ 57 NONAME + _ZN13PhoneCallUtil14DialVoiceCallLEv @ 58 NONAME + _ZN13PhoneCallUtil15DisconnectCallLEv @ 59 NONAME + _ZN13PhoneCallUtil17CheckIfCallExistsEj11TPECallType @ 60 NONAME + _ZN13PhoneCallUtil18DialMultimediaCallEv @ 61 NONAME + _ZN13PhoneCallUtil19IsAnyConnectedCallsEv @ 62 NONAME + _ZN15CPhoneStateIdle10ConstructLEv @ 63 NONAME + _ZN15CPhoneStateIdle14DialVoiceCallLEv @ 64 NONAME + _ZN15CPhoneStateIdle14HandleCommandLEi @ 65 NONAME + _ZN15CPhoneStateIdle14HandleDialingLEi @ 66 NONAME + _ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 67 NONAME + _ZN15CPhoneStateIdle15ProcessCommandLEi @ 68 NONAME + _ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 69 NONAME + _ZN15CPhoneStateIdle18HandleSendCommandLEv @ 70 NONAME + _ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 71 NONAME + _ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 72 NONAME + _ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 73 NONAME + _ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 74 NONAME + _ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 75 NONAME + _ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 76 NONAME + _ZN15CPhoneStateIdle5DialLERK7TDesC16NS_16TPhoneNumberTypeENS_21TDialInitiationMethodE @ 77 NONAME + _ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 78 NONAME + _ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 79 NONAME + _ZN15CPhoneStateIdleD0Ev @ 80 NONAME + _ZN15CPhoneStateIdleD1Ev @ 81 NONAME + _ZN15CPhoneStateIdleD2Ev @ 82 NONAME + _ZN17CPhoneStateHandle12StateMachineEv @ 83 NONAME + _ZN17CPhoneStateHandle17ViewCommandHandleEv @ 84 NONAME + _ZN17CPhoneStateHandle8InstanceEv @ 85 NONAME + _ZN17CPhoneStateInCall10ConstructLEv @ 86 NONAME + _ZN17CPhoneStateInCall11HandleIdleLEi @ 87 NONAME + _ZN17CPhoneStateInCall14HandleCommandLEi @ 88 NONAME + _ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 89 NONAME + _ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 90 NONAME + _ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 91 NONAME + _ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 92 NONAME + _ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 93 NONAME + _ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 94 NONAME + _ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 95 NONAME + _ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 96 NONAME + _ZN17CPhoneStateInCallD0Ev @ 97 NONAME + _ZN17CPhoneStateInCallD1Ev @ 98 NONAME + _ZN17CPhoneStateInCallD2Ev @ 99 NONAME + _ZN18CPhoneStateMachine11ChangeStateEi @ 100 NONAME + _ZN18CPhoneStateMachine11PhoneEngineEv @ 101 NONAME + _ZN18CPhoneStateMachine12PhoneStorageEv @ 102 NONAME + _ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 103 NONAME + _ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 104 NONAME + _ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 105 NONAME + _ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 106 NONAME + _ZN18CPhoneStateMachine5StateEv @ 107 NONAME + _ZN18CPhoneStateMachine9SetCallIdEi @ 108 NONAME + _ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 109 NONAME + _ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 110 NONAME + _ZN18CPhoneStateMachineD0Ev @ 111 NONAME + _ZN18CPhoneStateMachineD1Ev @ 112 NONAME + _ZN18CPhoneStateMachineD2Ev @ 113 NONAME + _ZN18CPhoneStateStartup10ConstructLEv @ 114 NONAME + _ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 115 NONAME + _ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 116 NONAME + _ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 117 NONAME + _ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 118 NONAME + _ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 119 NONAME + _ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 120 NONAME + _ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 121 NONAME + _ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 122 NONAME + _ZN18CPhoneStateStartupD0Ev @ 123 NONAME + _ZN18CPhoneStateStartupD1Ev @ 124 NONAME + _ZN18CPhoneStateStartupD2Ev @ 125 NONAME + _ZN18CPhoneUIController10EngineInfoEv @ 126 NONAME + _ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 127 NONAME + _ZN18CPhoneUIController13HandleMessageEii @ 128 NONAME + _ZN18CPhoneUIController14HandleCommandLEi @ 129 NONAME + _ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 130 NONAME + _ZN18CPhoneUIController15ProcessCommandLEi @ 131 NONAME + _ZN18CPhoneUIController19HandlePhoneStartupLEv @ 132 NONAME + _ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 133 NONAME + _ZN18CPhoneUIControllerD0Ev @ 134 NONAME + _ZN18CPhoneUIControllerD1Ev @ 135 NONAME + _ZN18CPhoneUIControllerD2Ev @ 136 NONAME + _ZN19CPhoneStateIncoming10ConstructLEv @ 137 NONAME + _ZN19CPhoneStateIncoming14HandleCommandLEi @ 138 NONAME + _ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 139 NONAME + _ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 140 NONAME + _ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 141 NONAME + _ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 142 NONAME + _ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 143 NONAME + _ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 144 NONAME + _ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 145 NONAME + _ZN19CPhoneStateIncomingD0Ev @ 146 NONAME + _ZN19CPhoneStateIncomingD1Ev @ 147 NONAME + _ZN19CPhoneStateIncomingD2Ev @ 148 NONAME + _ZN20CPhoneStateCallSetup10ConstructLEv @ 149 NONAME + _ZN20CPhoneStateCallSetup14HandleCommandLEi @ 150 NONAME + _ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 151 NONAME + _ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 152 NONAME + _ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 153 NONAME + _ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 154 NONAME + _ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 155 NONAME + _ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 156 NONAME + _ZN20CPhoneStateCallSetupD0Ev @ 157 NONAME + _ZN20CPhoneStateCallSetupD1Ev @ 158 NONAME + _ZN20CPhoneStateCallSetupD2Ev @ 159 NONAME + _ZN24CPhoneNumberEntryManager20CallFromNumberEntryLEv @ 160 NONAME + _ZN24CPhoneNumberEntryManager24StoreNumberEntryContentLEv @ 161 NONAME + _ZN24CPhoneNumberEntryManager25SetNumberEntryVisibilityLEi @ 162 NONAME + _ZN24CPhoneNumberEntryManager26IsNumberEntryContentStoredEv @ 163 NONAME + _ZN24CPhoneNumberEntryManager28ClearNumberEntryContentCacheEv @ 164 NONAME + _ZN24CPhoneNumberEntryManager31SetVisibilityIfNumberEntryUsedLEi @ 165 NONAME + _ZN24CPhoneNumberEntryManager37RemoveNumberEntryIfVisibilityIsFalseLEv @ 166 NONAME + _ZN24CPhoneNumberEntryManager43ClearNumberEntryContentCacheIfContentStoredEv @ 167 NONAME + _ZNK11CPhoneState12IsAutoLockOnEv @ 168 NONAME + _ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 169 NONAME + _ZNK11CPhoneState8EikonEnvEv @ 170 NONAME + _ZNK11CPhoneState8SimStateEv @ 171 NONAME + _ZNK18CPhoneStateMachine8EikonEnvEv @ 172 NONAME + _ZNK24CPhoneNumberEntryManager17NumberEntryClearLEv @ 173 NONAME + _ZNK24CPhoneNumberEntryManager18IsNumberEntryUsedLEv @ 174 NONAME + _ZNK24CPhoneNumberEntryManager21IsNumberEntryVisibleLEv @ 175 NONAME + _ZNK24CPhoneNumberEntryManager22PhoneNumberFromEntryLCEv @ 176 NONAME + _ZNK24CPhoneNumberEntryManager26IsCustomizedDialerVisibleLEv @ 177 NONAME + _ZTI11CPhoneState @ 178 NONAME + _ZTI15CPhoneStateIdle @ 179 NONAME + _ZTI17CPhoneStateHandle @ 180 NONAME + _ZTI17CPhoneStateInCall @ 181 NONAME + _ZTI18CPhoneStateMachine @ 182 NONAME + _ZTI18CPhoneStateStartup @ 183 NONAME + _ZTI18CPhoneUIController @ 184 NONAME + _ZTI19CPhoneStateIncoming @ 185 NONAME + _ZTI20CPhoneStateCallSetup @ 186 NONAME + _ZTI23CPhoneDtmfWaitCharTimer @ 187 NONAME + _ZTI24CPhoneSystemEventHandler @ 188 NONAME + _ZTI26CPhoneRemoteControlHandler @ 189 NONAME + _ZTI27CPhoneBtaaDisconnectHandler @ 190 NONAME + _ZTV11CPhoneState @ 191 NONAME + _ZTV15CPhoneStateIdle @ 192 NONAME + _ZTV17CPhoneStateHandle @ 193 NONAME + _ZTV17CPhoneStateInCall @ 194 NONAME + _ZTV18CPhoneStateMachine @ 195 NONAME + _ZTV18CPhoneStateStartup @ 196 NONAME + _ZTV18CPhoneUIController @ 197 NONAME + _ZTV19CPhoneStateIncoming @ 198 NONAME + _ZTV20CPhoneStateCallSetup @ 199 NONAME + _ZTV23CPhoneDtmfWaitCharTimer @ 200 NONAME + _ZTV24CPhoneSystemEventHandler @ 201 NONAME + _ZTV26CPhoneRemoteControlHandler @ 202 NONAME + _ZTV27CPhoneBtaaDisconnectHandler @ 203 NONAME + _ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 204 NONAME + _ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 205 NONAME + _ZThn12_N11CPhoneStateD0Ev @ 206 NONAME + _ZThn12_N11CPhoneStateD1Ev @ 207 NONAME + _ZThn12_N15CPhoneStateIdleD0Ev @ 208 NONAME + _ZThn12_N15CPhoneStateIdleD1Ev @ 209 NONAME + _ZThn12_N17CPhoneStateInCallD0Ev @ 210 NONAME + _ZThn12_N17CPhoneStateInCallD1Ev @ 211 NONAME + _ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 212 NONAME + _ZThn12_N18CPhoneStateStartupD0Ev @ 213 NONAME + _ZThn12_N18CPhoneStateStartupD1Ev @ 214 NONAME + _ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 215 NONAME + _ZThn12_N18CPhoneUIControllerD0Ev @ 216 NONAME + _ZThn12_N18CPhoneUIControllerD1Ev @ 217 NONAME + _ZThn12_N19CPhoneStateIncomingD0Ev @ 218 NONAME + _ZThn12_N19CPhoneStateIncomingD1Ev @ 219 NONAME + _ZThn12_N20CPhoneStateCallSetupD0Ev @ 220 NONAME + _ZThn12_N20CPhoneStateCallSetupD1Ev @ 221 NONAME + _ZThn16_N11CPhoneState14HandleCommandLEi @ 222 NONAME + _ZThn16_N11CPhoneState15ProcessCommandLEi @ 223 NONAME + _ZThn16_N11CPhoneStateD0Ev @ 224 NONAME + _ZThn16_N11CPhoneStateD1Ev @ 225 NONAME + _ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 226 NONAME + _ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 227 NONAME + _ZThn16_N15CPhoneStateIdleD0Ev @ 228 NONAME + _ZThn16_N15CPhoneStateIdleD1Ev @ 229 NONAME + _ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 230 NONAME + _ZThn16_N17CPhoneStateInCallD0Ev @ 231 NONAME + _ZThn16_N17CPhoneStateInCallD1Ev @ 232 NONAME + _ZThn16_N18CPhoneStateStartupD0Ev @ 233 NONAME + _ZThn16_N18CPhoneStateStartupD1Ev @ 234 NONAME + _ZThn16_N18CPhoneUIController14HandleCommandLEi @ 235 NONAME + _ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 236 NONAME + _ZThn16_N18CPhoneUIControllerD0Ev @ 237 NONAME + _ZThn16_N18CPhoneUIControllerD1Ev @ 238 NONAME + _ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 239 NONAME + _ZThn16_N19CPhoneStateIncomingD0Ev @ 240 NONAME + _ZThn16_N19CPhoneStateIncomingD1Ev @ 241 NONAME + _ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 242 NONAME + _ZThn16_N20CPhoneStateCallSetupD0Ev @ 243 NONAME + _ZThn16_N20CPhoneStateCallSetupD1Ev @ 244 NONAME + _ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 245 NONAME + _ZThn20_N11CPhoneStateD0Ev @ 246 NONAME + _ZThn20_N11CPhoneStateD1Ev @ 247 NONAME + _ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 248 NONAME + _ZThn20_N15CPhoneStateIdleD0Ev @ 249 NONAME + _ZThn20_N15CPhoneStateIdleD1Ev @ 250 NONAME + _ZThn20_N17CPhoneStateInCallD0Ev @ 251 NONAME + _ZThn20_N17CPhoneStateInCallD1Ev @ 252 NONAME + _ZThn20_N18CPhoneStateStartupD0Ev @ 253 NONAME + _ZThn20_N18CPhoneStateStartupD1Ev @ 254 NONAME + _ZThn20_N19CPhoneStateIncomingD0Ev @ 255 NONAME + _ZThn20_N19CPhoneStateIncomingD1Ev @ 256 NONAME + _ZThn20_N20CPhoneStateCallSetupD0Ev @ 257 NONAME + _ZThn20_N20CPhoneStateCallSetupD1Ev @ 258 NONAME + _ZThn24_N11CPhoneState25HandleNumberEntryClearedLEv @ 259 NONAME + _ZThn24_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 260 NONAME + _ZThn24_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 261 NONAME + _ZThn24_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 262 NONAME + _ZThn24_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 263 NONAME + _ZThn28_NK11CPhoneState12IsAutoLockOnEv @ 264 NONAME + _ZThn32_N11CPhoneState11SetEikonEnvEP9CEikonEnv @ 265 NONAME + _ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 266 NONAME + _ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 267 NONAME + _ZThn4_N11CPhoneStateD0Ev @ 268 NONAME + _ZThn4_N11CPhoneStateD1Ev @ 269 NONAME + _ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 270 NONAME + _ZThn4_N15CPhoneStateIdleD0Ev @ 271 NONAME + _ZThn4_N15CPhoneStateIdleD1Ev @ 272 NONAME + _ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 273 NONAME + _ZThn4_N17CPhoneStateInCallD0Ev @ 274 NONAME + _ZThn4_N17CPhoneStateInCallD1Ev @ 275 NONAME + _ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 276 NONAME + _ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 277 NONAME + _ZThn4_N18CPhoneStateMachine12PhoneStorageEv @ 278 NONAME + _ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 279 NONAME + _ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 280 NONAME + _ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 281 NONAME + _ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 282 NONAME + _ZThn4_N18CPhoneStateMachine5StateEv @ 283 NONAME + _ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 284 NONAME + _ZThn4_N18CPhoneStateMachineD0Ev @ 285 NONAME + _ZThn4_N18CPhoneStateMachineD1Ev @ 286 NONAME + _ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 287 NONAME + _ZThn4_N18CPhoneStateStartupD0Ev @ 288 NONAME + _ZThn4_N18CPhoneStateStartupD1Ev @ 289 NONAME + _ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 290 NONAME + _ZThn4_N18CPhoneUIController13HandleMessageEii @ 291 NONAME + _ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 292 NONAME + _ZThn4_N19CPhoneStateIncomingD0Ev @ 293 NONAME + _ZThn4_N19CPhoneStateIncomingD1Ev @ 294 NONAME + _ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 295 NONAME + _ZThn4_N20CPhoneStateCallSetupD0Ev @ 296 NONAME + _ZThn4_N20CPhoneStateCallSetupD1Ev @ 297 NONAME + _ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 298 NONAME + _ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 299 NONAME + _ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 300 NONAME + _ZThn8_N11CPhoneStateD0Ev @ 301 NONAME + _ZThn8_N11CPhoneStateD1Ev @ 302 NONAME + _ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 303 NONAME + _ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 304 NONAME + _ZThn8_N15CPhoneStateIdleD0Ev @ 305 NONAME + _ZThn8_N15CPhoneStateIdleD1Ev @ 306 NONAME + _ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 307 NONAME + _ZThn8_N17CPhoneStateInCallD0Ev @ 308 NONAME + _ZThn8_N17CPhoneStateInCallD1Ev @ 309 NONAME + _ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 310 NONAME + _ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 311 NONAME + _ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 312 NONAME + _ZThn8_N18CPhoneStateStartupD0Ev @ 313 NONAME + _ZThn8_N18CPhoneStateStartupD1Ev @ 314 NONAME + _ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 315 NONAME + _ZThn8_N18CPhoneUIControllerD0Ev @ 316 NONAME + _ZThn8_N18CPhoneUIControllerD1Ev @ 317 NONAME + _ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 318 NONAME + _ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 319 NONAME + _ZThn8_N19CPhoneStateIncomingD0Ev @ 320 NONAME + _ZThn8_N19CPhoneStateIncomingD1Ev @ 321 NONAME + _ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 322 NONAME + _ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 323 NONAME + _ZThn8_N20CPhoneStateCallSetupD0Ev @ 324 NONAME + _ZThn8_N20CPhoneStateCallSetupD1Ev @ 325 NONAME diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/group/phoneuicontrol.mmp --- a/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -50,6 +50,7 @@ SOURCE cphoneuicommandmanager.cpp SOURCE phonenoteutil.cpp SOURCE phoneaudioutil.cpp +SOURCE phonecallutil.cpp /* Languages */ LANG SC @@ -98,5 +99,6 @@ LIBRARY phonemediatorcenter.lib +LIBRARY apparc.lib SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/inc/cphonestate.h --- a/phoneapp/phoneuicontrol/inc/cphonestate.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonestate.h Fri Oct 15 12:58:46 2010 +0300 @@ -249,7 +249,7 @@ /** * Dial CS multimedia call */ - IMPORT_C void DialMultimediaCallL(); + IMPORT_C void DialMultimediaCall(); /** * Disconnect call @@ -438,27 +438,12 @@ protected: /** - * Checks if call is waiting, returns ETrue if call is waiting - * otherwise EFalse. - * @param aCallId, call id. - */ - TBool IsWaitingCallL( const TInt aCallId ); - - /** * Checks status of KFeatureIdSideVolumeKeys and KTelephonyLVFlagScrollVolumeKeys * keys. If KTelephonyLVFlagScrollVolumeKeys is false and KFeatureIdSideVolumeKeys is true * then side volume keys are only supported and method returns true, otherwise false. */ TBool OnlySideVolumeKeySupported(); - /** - * Checks if device has connected call ongoing. - * List of connected call states: EPEStateConnected - * EPEStateConnectedConference - * EPEStateConnecting - */ - TBool IsAnyConnectedCalls(); - private: /** @@ -574,15 +559,15 @@ // Number entry manager CPhoneNumberEntryManager* iNumberEntryManager; + // Internal variable for EikonEnv to avoid + // use of static system calls + CEikonEnv* iEnv; // Not owned private: // Previously handled SIM card state. TPESimState iPreviousSimState; - // Internal variable for EikonEnv to avoid - // use of static system calls - CEikonEnv* iEnv; // Not owned }; #endif // CPHONESTATE_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/inc/cphonestateidle.h --- a/phoneapp/phoneuicontrol/inc/cphonestateidle.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonestateidle.h Fri Oct 15 12:58:46 2010 +0300 @@ -217,6 +217,16 @@ * value to false. */ void ChangeTo( TInt aState ); + + /** + * Launch Qt process. + */ + void LaunchQtProcessL(TUid aUid); + + /** + * Close Qt process. + */ + void CloseQtProcess(TUid aUid); private: diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/inc/cphonestateincall.h --- a/phoneapp/phoneuicontrol/inc/cphonestateincall.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonestateincall.h Fri Oct 15 12:58:46 2010 +0300 @@ -102,18 +102,6 @@ * @return ETrue if active otherwise EFalse */ IMPORT_C virtual TBool IsVideoCallActiveL(); - - /** - * Method for quering is video call ringing. - * @return ETrue if ringing otherwise EFalse - */ - IMPORT_C virtual TBool IsVideoCallRingingL(); - - /** - * Method for quering ringing call . - * @return call id otherwise KErrNotFound - */ - IMPORT_C virtual TBool GetRingingCallL(); /** * Search and release outgoingcall diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/inc/cphonestateincoming.h --- a/phoneapp/phoneuicontrol/inc/cphonestateincoming.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonestateincoming.h Fri Oct 15 12:58:46 2010 +0300 @@ -130,18 +130,6 @@ void DisconnectWaitingCallL(); /** - * Gets resource to use when number entry is open - * @return resource id - */ - TInt GetNumberEntryVisibleMenuBar(); - - /** - * Gets resource to use when number entry is closed - * @return resource id - */ - TInt GetNumberEntryNotVisibleMenuBar(); - - /** * Show disconnected note */ void ShowDisconnectingL( TInt aCallId ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/inc/phonecallutil.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/inc/phonecallutil.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,93 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Call util class. +* +*/ + + +#ifndef PHONECALLUTIL_H +#define PHONECALLUTIL_H + +// INCLUDES +#include +#include "mphoneviewcommandhandle.h" +#include "mphonestatemachine.h" + +// CLASS DECLARATION + +/** +* Call util class. +* +*/ +class PhoneCallUtil + { + public: + + /** + * Dials multimedia call. + */ + IMPORT_C static void DialMultimediaCall(); + + /** + * Dials voice call. + */ + IMPORT_C static void DialVoiceCallL(); + + /** + * Disconnects call. + */ + IMPORT_C static TBool DisconnectCallL(); + + /** + * Checks is call a video call. + */ + IMPORT_C static TBool IsVideoCall( const TInt aCallId ); + + /** + * Returns call id by state (KErrNotFound if call + * not exists). + */ + IMPORT_C static TInt CallIdByState( const TPEState aCallState ); + + /** + * Checks if call exists by state and type (returns + * EFalse if call not exists). + */ + IMPORT_C static TBool CheckIfCallExists( + const TPEState aCallState, const TPECallType aCallType ); + + /** + * Checks is there any connected calls. + * List of connected call states: EPEStateConnected + * EPEStateConnectedConference + * EPEStateConnecting + */ + IMPORT_C static TBool IsAnyConnectedCalls(); + + private: + + /** + * Returns view command handler. + */ + inline static MPhoneViewCommandHandle* ViewCommandHandle(); + + /** + * Returns phone state handler. + */ + inline static MPhoneStateMachine* StateMachine(); + }; + +#endif // PHONECALLUTIL_H + +// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/cphonebtaadisconnecthandler.cpp --- a/phoneapp/phoneuicontrol/src/cphonebtaadisconnecthandler.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonebtaadisconnecthandler.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -34,6 +34,7 @@ #include "tphonecmdparamcallstatedata.h" #include "telinternalsingletonuids.h" #include "cphonestatehandle.h" +#include "phonecallutil.h" // CONSTANTS @@ -159,12 +160,8 @@ if ( FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) ) { - // Fetch active call's id from view - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - TInt call = callStateData.CallId(); + // Fetch active call's id + TInt call = PhoneCallUtil::CallIdByState( EPEStateConnected ); if ( call != KErrNotFound && iStateMachine->PhoneEngineInfo()->CallType( call ) == EPECallTypeVideo ) { @@ -251,15 +248,11 @@ if( iVideoCallStatus ) { - // Fetch active call's id from view - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() != KErrNotFound ) + // Fetch active call's id + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnected ); + if ( callId != KErrNotFound ) { - iStateMachine->SetCallId( callStateData.CallId() ); + iStateMachine->SetCallId( callId ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease ); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/cphonestate.cpp --- a/phoneapp/phoneuicontrol/src/cphonestate.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -67,7 +67,6 @@ #include "tphonecmdparamglobalnote.h" #include "tphonecmdparamquery.h" #include "tphonecmdparamstring.h" -#include "tphonecmdparamcallstatedata.h" #include "tphonecmdparambitmap.h" #include "tphonecmdparamappinfo.h" #include "tphonecmdparamtranseffect.h" @@ -100,6 +99,8 @@ #include "cphoneclearblacklist.h" #include "phonenoteutil.h" #include "phoneaudioutil.h" +#include "phonecallutil.h" + // ================= MEMBER FUNCTIONS ======================= @@ -835,13 +836,12 @@ // CPhoneState::DialMultimediaCallL // ----------------------------------------------------------- // -EXPORT_C void CPhoneState::DialMultimediaCallL() +EXPORT_C void CPhoneState::DialMultimediaCall() { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DialMultimediaCall() "); __ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) ); - iStateMachine->PhoneEngineInfo()->SetCallTypeCommand( EPECallTypeVideo ); - iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageDial ); + PhoneCallUtil::DialMultimediaCall(); } // ----------------------------------------------------------- @@ -852,12 +852,7 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DialVoiceCallL() "); __ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) ); - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( ETrue ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); - iStateMachine->PhoneEngineInfo()->SetCallTypeCommand( EPECallTypeCSVoice ); - iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageDial ); + PhoneCallUtil::DialVoiceCallL(); } // ----------------------------------------------------------- @@ -867,39 +862,7 @@ EXPORT_C TBool CPhoneState::DisconnectCallL() { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DisconnectCallL( ) "); - TPhoneCmdParamInteger callIdParam; - iViewCommandHandle->ExecuteCommand( - EPhoneViewGetExpandedBubbleCallId, &callIdParam ); - TBool ret = EFalse; - if( callIdParam.Integer() > KErrNotFound ) - { - iStateMachine->SetCallId( callIdParam.Integer() ); - if( IsVideoCall( callIdParam.Integer() ) ) - { - // Video call can be released only after we get response to VT Shutdown Command - CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( - KMediatorVideoTelephonyDomain, - KCatPhoneToVideotelCommands, - EVtCmdReleaseDataport, - TVersion( KPhoneToVideotelCmdVersionMajor, - KPhoneToVideotelCmdVersionMinor, - KPhoneToVideotelCmdVersionBuild ), - KNullDesC8, - CPhoneReleaseCommand::NewL( *iStateMachine ) ); - } - else - { - iStateMachine->SendPhoneEngineMessage( - MPEPhoneModel::EPEMessageRelease ); - } - ret = ETrue; - } - else - { - __PHONELOG( EOnlyFatal, EPhoneControl, - "CPhoneState::DisconnectCallL has negative call id!" ); - } - return ret; + return PhoneCallUtil::DisconnectCallL(); } // ----------------------------------------------------------- @@ -948,30 +911,6 @@ } // ----------------------------------------------------------- -// CPhoneState::IsWaitingCallL -// ----------------------------------------------------------- -// -TBool CPhoneState::IsWaitingCallL( const TInt aCallId ) - { - __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::IsWaitingCallL( ) "); - TBool waiting( EFalse ); - if ( aCallId >= 0 && - iStateMachine->PhoneEngineInfo()->CallState( aCallId ) == EPEStateRinging ) - { - TPhoneCmdParamInteger activeCallCount; - iViewCommandHandle->ExecuteCommandL( - EPhoneViewGetCountOfActiveCalls, &activeCallCount ); - - if( activeCallCount.Integer() > 0 ) - { - waiting = ETrue; - } - } - - return waiting; - } - -// ----------------------------------------------------------- // CPhoneState::UpdateCallHeader // ----------------------------------------------------------- // @@ -1204,12 +1143,7 @@ EXPORT_C TBool CPhoneState::IsVideoCall( const TInt aCallId ) { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::IsVideoCall( ) "); - if ( aCallId < 0 ) - { - return EFalse; - } - - return EPECallTypeVideo == iStateMachine->PhoneEngineInfo()->CallType( aCallId ); + return PhoneCallUtil::IsVideoCall( aCallId ); } // --------------------------------------------------------- @@ -1724,24 +1658,6 @@ EikonEnv() ); } -// ----------------------------------------------------------- -// CPhoneState::IsAnyConnectedCalls -// ----------------------------------------------------------- -// -TBool CPhoneState::IsAnyConnectedCalls() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::IsAnyConnectedCalls() "); - TBool connectedCall(EFalse); - if ( iStateMachine->PhoneEngineInfo()->CheckIfCallStateExists( EPEStateConnected ) || - iStateMachine->PhoneEngineInfo()->CheckIfCallStateExists( EPEStateConnecting ) || - iStateMachine->PhoneEngineInfo()->CheckIfCallStateExists( EPEStateConnectedConference ) ) - { - connectedCall = ETrue; - } - __PHONELOG1( EBasic, EPhoneControl, "CPhoneState::IsAnyConnectedCalls: (%d)", connectedCall ); - return connectedCall; - } - // --------------------------------------------------------- // CPhoneState::SetToolbarButtonLoudspeakerEnabled // --------------------------------------------------------- @@ -1780,22 +1696,13 @@ __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::OpenSoftRejectMessageEditorL ()" ); iUiCommandManager->SetSoftRejectStatus( EFalse ); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - TInt ringingCallId( KErrNotFound ); - // Do nothing if negative incoming call id - if( callStateData.CallId() > KErrNotFound ) + TInt ringingCallId( PhoneCallUtil::CallIdByState( EPEStateRinging ) ); + + TPhoneCmdParamSfiData sfiDataParam; + if( ringingCallId > KErrNotFound ) { iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery ); - ringingCallId = callStateData.CallId(); - } - - TPhoneCmdParamSfiData sfiDataParam; - if (KErrNotFound != ringingCallId) - { if ( iStateMachine->PhoneEngineInfo()-> RemoteName( ringingCallId ).Length() ) { @@ -1827,7 +1734,7 @@ TNumberEntrySetRule aRule ) { __LOGMETHODSTARTEND(EPhoneControl, - "CPhoneState::BringIncomingCallHeaderToForegroundL( ) "); + "CPhoneState::DisplayCallHeaderL( ) "); BeginUiUpdateLC(); switch ( aRule ) { @@ -1843,8 +1750,8 @@ break; } iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewCreateCallHeader, aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewBringPhoneAppToForeground ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewCreateCallHeader, aCallId ); UpdateUiCommands(); EndUiUpdate(); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp --- a/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -28,7 +28,6 @@ #include "mphonestatemachine.h" #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "tphonecmdparamcallheaderdata.h" #include "tphonecmdparamglobalnote.h" #include "tphonecmdparamstring.h" @@ -477,13 +476,14 @@ iViewCommandHandle->ExecuteCommand( EPhoneViewGetNumberFromEntry, &stringParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); iViewCommandHandle->ExecuteCommandL( EPhoneViewLaunchLogs, &stringParam ); } else { RemoveDialogsAndSendPhoneToBackgroundL(); } + + iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); EndUiUpdate(); CleanupStack::PopAndDestroy( phoneNumber ); iStateMachine->ChangeState( EPhoneStateIdle ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/cphonestateidle.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -30,6 +30,7 @@ #include #include #include +#include #include "cphonepubsubproxy.h" #include "cphonecenrepproxy.h" @@ -45,7 +46,6 @@ #include "tphonecmdparamappinfo.h" #include "cphonekeys.h" -#include "tphonecmdparamcallstatedata.h" #include "phoneviewcommanddefinitions.h" #include "phoneui.hrh" #include "phonerssbase.h" @@ -54,6 +54,7 @@ #include "phoneui.pan" #include "mphonecustomization.h" +const TUid KNetworkHandlingStarterUid = { 0x2002E67A }; // ================= MEMBER FUNCTIONS ======================= @@ -71,6 +72,9 @@ // Destructor EXPORT_C CPhoneStateIdle::~CPhoneStateIdle() { + __LOGMETHODSTARTEND( + EPhoneControl, "CPhoneStateIdle::~CPhoneStateIdle()" ); + CloseQtProcess(KNetworkHandlingStarterUid); } // ----------------------------------------------------------- @@ -81,6 +85,8 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::ConstructL() "); CPhoneState::BaseConstructL(); + + LaunchQtProcessL(KNetworkHandlingStarterUid); } // ----------------------------------------------------------- @@ -289,7 +295,11 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIncomingL( ) "); HandleAudioAvailableOutputChangedL(); - SetRingingTonePlaybackL( aCallId ); + + TPhoneCmdParamBoolean ringingParam; + ringingParam.SetBoolean( ETrue ); + iViewCommandHandle->ExecuteCommand( + EPhoneViewSetRingingFlag,&ringingParam); BeginUiUpdateLC(); iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(EFalse); @@ -298,6 +308,8 @@ UpdateUiCommands(); EndUiUpdate(); + SetRingingTonePlaybackL( aCallId ); + ChangeTo( EPhoneStateIncoming ); } @@ -452,7 +464,7 @@ { // call the number iStateMachine->PhoneEngineInfo()->SetPhoneNumber( *phoneNumber ); - DialMultimediaCallL(); + DialMultimediaCall(); CleanupStack::PopAndDestroy( phoneNumber ); } } @@ -609,7 +621,7 @@ } else { - CPhoneState::DialMultimediaCallL(); + CPhoneState::DialMultimediaCall(); } } @@ -688,5 +700,39 @@ aState ); iStateMachine->ChangeState( aState ); } + +// ----------------------------------------------------------- +// CPhoneStateIdle::LaunchQtProcessL +// ----------------------------------------------------------- +// +void CPhoneStateIdle::LaunchQtProcessL(TUid aUid) + { + __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::LaunchQtProcessL()" ); + TApaAppInfo appInfo; + RApaLsSession lsSession; + User::LeaveIfError( lsSession.Connect() ); + CleanupClosePushL( lsSession ); + User::LeaveIfError( lsSession.GetAppInfo( appInfo, aUid ) ); + CApaCommandLine* cmdLine = CApaCommandLine::NewLC(); + cmdLine->SetExecutableNameL( appInfo.iFullName ); + cmdLine->SetCommandL( EApaCommandRun ); + User::LeaveIfError( lsSession.StartApp( *cmdLine ) ); + CleanupStack::PopAndDestroy( 2 ); + } +// ----------------------------------------------------------- +// CPhoneStateIdle::CloseQtProcess +// ----------------------------------------------------------- +// +void CPhoneStateIdle::CloseQtProcess(TUid aUid) + { + __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::CloseQtProcess()" ); + TApaTaskList appList( iEnv->WsSession() ); + TApaTask task = appList.FindApp( aUid ); + if ( task.Exists() ) + { + task.KillTask(); + } + } + // End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/cphonestateincall.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -32,7 +32,6 @@ #include "tphonecmdparamstring.h" #include "tphonecmdparamnote.h" #include "tphonecmdparamquery.h" -#include "tphonecmdparamcallstatedata.h" #include "tphonecmdparamkeycapture.h" #include "tphonecmdparamsfidata.h" #include "mphonestatemachine.h" @@ -50,6 +49,8 @@ #include "cphonemediatorsender.h" #include "cphoneterminateallconnectionscommand.h" #include "mphonecustomization.h" +#include "phonecallutil.h" + // ================= MEMBER FUNCTIONS ======================= @@ -247,10 +248,11 @@ iViewCommandHandle->ExecuteCommand( EPhoneViewGetNumberFromEntry, &stringParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); showDialer = ETrue; } + iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); + if ( IsAutoLockOn() || !showDialer ) { RemoveDialogsAndSendPhoneToBackgroundL(); @@ -612,24 +614,18 @@ __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::LaunchDtmfListQueryL()" ); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() == KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnected ); + if ( callId == KErrNotFound ) { - callStateData.SetCallState( EPEStateConnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); + callId = PhoneCallUtil::CallIdByState( EPEStateConnecting ); } - if ( callStateData.CallId() > KErrNotFound ) + if ( callId > KErrNotFound ) { //Get Array of DTMF strings from PhoneEngine const CDesCArray& dtmfArray = iStateMachine->PhoneEngineInfo()-> - RemotePredefinedDtmfStrings( callStateData.CallId() ); + RemotePredefinedDtmfStrings( callId ); TInt itemCount = dtmfArray.Count(); if ( itemCount ) { @@ -658,7 +654,7 @@ "CPhoneStateInCall::LaunchDtmfListQueryL() No found valid call id" ); } // if there is a connected call only then open DtmfListQuery. - if ( IsAnyConnectedCalls() ) + if ( PhoneCallUtil::IsAnyConnectedCalls() ) { TPhoneCmdParamQuery queryDialogParam; queryDialogParam.SetQueryType( EPhoneDtmfListQueryDialog ); @@ -678,53 +674,8 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::IsVideoCallActive()" ); - TBool retVal = EFalse; - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if ( callStateData.CallId() > KErrNotFound ) - { - retVal = IsVideoCall( callStateData.CallId() ); - } - return retVal; - } - -// --------------------------------------------------------- -// CPhoneStateInCall::IsVideoCallRingingL -// --------------------------------------------------------- -// - -EXPORT_C TBool CPhoneStateInCall::IsVideoCallRingingL() - { - __LOGMETHODSTARTEND(EPhoneControl, - "CPhoneStateInCall::IsVideoCallRingingL()" ); - TBool retVal = EFalse; - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if ( callStateData.CallId() > KErrNotFound ) - { - retVal = IsVideoCall( callStateData.CallId() ); - } - return retVal; - } - -// --------------------------------------------------------- -// CPhoneStateInCall::GetRingingCallL -// --------------------------------------------------------- -// - -EXPORT_C TInt CPhoneStateInCall::GetRingingCallL() - { - __LOGMETHODSTARTEND(EPhoneControl, - "CPhoneStateInCall::GetRingingCallL()" ); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - return callStateData.CallId(); + return PhoneCallUtil::CheckIfCallExists( + EPEStateConnected, EPECallTypeVideo); } // ----------------------------------------------------------- @@ -734,24 +685,17 @@ EXPORT_C void CPhoneStateInCall::DisconnectOutgoingCallL() { __LOGMETHODSTARTEND(EPhoneControl, - "CPhoneStateInCall::DisconnectOutgoingCallL()"); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if( callStateData.CallId() == KErrNotFound ) + "CPhoneStateInCall::DisconnectOutgoingCallL()"); + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnecting ); + if( callId == KErrNotFound ) { // No connecting call, find the dialing call - callStateData.SetCallState( EPEStateDialing ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); + callId = PhoneCallUtil::CallIdByState( EPEStateDialing ); - if( callStateData.CallId() == KErrNotFound ) + if( callId == KErrNotFound ) { // No dialing call, find the disconnectinging call - callStateData.SetCallState( EPEStateDisconnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); + callId = PhoneCallUtil::CallIdByState( EPEStateDisconnecting ); } else { @@ -759,9 +703,9 @@ } } - if( callStateData.CallId() > KErrNotFound ) + if( callId > KErrNotFound ) { - iStateMachine->SetCallId( callStateData.CallId() ); + iStateMachine->SetCallId( callId ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease ); } @@ -782,12 +726,8 @@ __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::HandleEndKeyPressL()"); if ( aMessage == EPhoneKeyLongPress ) { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if( IsVideoCall( callStateData.CallId() ) ) + if( PhoneCallUtil::CheckIfCallExists( + EPEStateConnected, EPECallTypeVideo) ) { // Video call can be released only after we get response to VT Shutdown Command CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/cphonestateincoming.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -34,7 +34,6 @@ #include "tphonecmdparamboolean.h" #include "tphonecmdparamcallheaderdata.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "tphonecmdparamringtone.h" #include "tphonecmdparamsfidata.h" #include "tphonecmdparamstring.h" @@ -54,6 +53,7 @@ #include "cphonereleasecommand.h" #include "mphonecustomization.h" #include "mphonestorage.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -88,15 +88,12 @@ { CPhoneState::BaseConstructL(); - // Fetch incoming call's id from view - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if( callStateData.CallId() > KErrNotFound ) + // Fetch incoming call's id + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if( callId > KErrNotFound ) { iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery ); - iRingingCallId = callStateData.CallId(); + iRingingCallId = callId; } else { @@ -322,6 +319,11 @@ SetBackButtonActive(ETrue); EndUiUpdate(); + if ( PhoneCallUtil::IsVideoCall( aCallId ) ) + { + iViewCommandHandle->ExecuteCommand( EPhoneViewSetVideoCallOnTop ); + } + iStateMachine->ChangeState( EPhoneStateSingle ); } @@ -442,15 +444,11 @@ "CPhoneStateIncoming::DisconnectWaitingCallL ()" ); iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone ); - // The ringing call might have changed - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() > KErrNotFound ) + // The ringing call might have changed + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if ( callId > KErrNotFound ) { - iRingingCallId = callStateData.CallId(); + iRingingCallId = callId; } iStateMachine->SetCallId( iRingingCallId ); @@ -507,35 +505,6 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenSoftRejectEditor, &sfiDataParam ); } - -// ----------------------------------------------------------- -// CPhoneStateIncoming::GetNumberEntryVisibleMenuBar -// ----------------------------------------------------------- -// -TInt CPhoneStateIncoming::GetNumberEntryVisibleMenuBar() - { - TInt resource(EPhoneIncomingCallMenubarWithNumberEntry); - if( IsVideoCall ( iRingingCallId ) ) - { - resource = EPhoneIncomingVideoCallMenubarWithNumberEntry; - } - return resource; - } - -// ----------------------------------------------------------- -// CPhoneStateIncoming::GetNumberEntryNotVisibleMenuBar -// ----------------------------------------------------------- -// -TInt CPhoneStateIncoming::GetNumberEntryNotVisibleMenuBar() - { - TInt resource(EPhoneIncomingCallMenubar); - if( IsVideoCall ( iRingingCallId ) ) - { - resource = EPhoneIncomingVideoCallMenubar; - } - return resource; - } - // ----------------------------------------------------------- // CPhoneStateIncoming::ShowDisconnectingL // ----------------------------------------------------------- diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/cphoneuicommandmanager.cpp --- a/phoneapp/phoneuicontrol/src/cphoneuicommandmanager.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphoneuicommandmanager.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -24,8 +24,8 @@ #include "phonelogger.h" #include "cphonemainresourceresolver.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "tphonecmdparamboolean.h" +#include "phonecallutil.h" // ======== MEMBER FUNCTIONS ======== @@ -115,19 +115,15 @@ void CPhoneUiCommandManager::SetSoftRejectDimmedFlag() { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneUiCommandManager::GetIncomingCallSilenceCBA ()" ); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - TRAPD( err, iViewCommandHandle.HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ) ); TPhoneCmdParamBoolean dimSoftRejectParam; - - if ( err == KErrNone && callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if ( callId > KErrNotFound ) { TBool privateNumber = iStateMachine.PhoneEngineInfo()-> - RemotePhoneNumber( callStateData.CallId() ).Length() == 0; + RemotePhoneNumber( callId ).Length() == 0; TBool voip = iStateMachine.PhoneEngineInfo()-> - CallType( callStateData.CallId() ) == EPECallTypeVoIP; + CallType( callId ) == EPECallTypeVoIP; dimSoftRejectParam.SetBoolean( privateNumber || !iSoftRejectStatus || voip ); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/phoneaudioutil.cpp --- a/phoneapp/phoneuicontrol/src/phoneaudioutil.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/phoneaudioutil.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -59,7 +59,7 @@ // --------------------------------------------------------- // void PhoneAudioUtil::HandleAudioOutputChangedL() - { + { MPhoneViewCommandHandle* viewCommandHandle = ViewCommandHandle(); @@ -102,10 +102,9 @@ { CPhoneBtaaDisconnectHandler::InstanceL()->Cancel(); } - else if ( RouteParameters.iShowNote && audioOutput == EPELoudspeaker ) + else if ( audioOutput == EPELoudspeaker ) { - // Avkon removal - // TODO Play tone + viewCommandHandle->ExecuteCommandL( EPhoneViewPlayHandsFreeActivatedTone ); } } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/src/phonecallutil.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/src/phonecallutil.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,198 @@ +/* +* 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: Acessory and Bluetooth handler. +* +*/ + + +// INCLUDE FILES +#include "phonecallutil.h" +#include "mphonestatemachine.h" +#include "mphoneviewcommandhandle.h" +#include "cphonestatehandle.h" +#include "tphonecmdparamboolean.h" +#include "tphonecmdparaminteger.h" +#include "cphonemediatorfactory.h" +#include "cphonemediatorsender.h" +#include "cphonereleasecommand.h" +#include "tphonecmdparamcallstatedata.h" + +#include +#include +#include +#include + +// CONSTANTS + +// ============================ MEMBER FUNCTIONS =============================== + +// --------------------------------------------------------- +// PhoneCallUtil::DialMultimediaCall +// --------------------------------------------------------- +// +EXPORT_C void PhoneCallUtil::DialMultimediaCall() + { + MPhoneStateMachine* stateMachine = StateMachine(); + stateMachine->PhoneEngineInfo()->SetCallTypeCommand( EPECallTypeVideo ); + stateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageDial ); + } + +// --------------------------------------------------------- +// PhoneCallUtil::DialVoiceCallL +// --------------------------------------------------------- +// +EXPORT_C void PhoneCallUtil::DialVoiceCallL() + { + MPhoneStateMachine* stateMachine = StateMachine(); + + TPhoneCmdParamBoolean globalNotifierParam; + globalNotifierParam.SetBoolean( ETrue ); + ViewCommandHandle()->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, + &globalNotifierParam ); + stateMachine->PhoneEngineInfo()->SetCallTypeCommand( EPECallTypeCSVoice ); + stateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageDial ); + } + +// ----------------------------------------------------------- +// PhoneCallUtil::DisconnectCallL +// ----------------------------------------------------------- +// +EXPORT_C TBool PhoneCallUtil::DisconnectCallL() + { + MPhoneStateMachine* stateMachine = StateMachine(); + TPhoneCmdParamInteger callIdParam; + + ViewCommandHandle()->ExecuteCommand( + EPhoneViewGetExpandedBubbleCallId, &callIdParam ); + TBool ret = EFalse; + if( callIdParam.Integer() > KErrNotFound ) + { + stateMachine->SetCallId( callIdParam.Integer() ); + if( IsVideoCall( callIdParam.Integer() ) ) + { + // Video call can be released only after we get response to VT Shutdown Command + CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( + KMediatorVideoTelephonyDomain, + KCatPhoneToVideotelCommands, + EVtCmdReleaseDataport, + TVersion( KPhoneToVideotelCmdVersionMajor, + KPhoneToVideotelCmdVersionMinor, + KPhoneToVideotelCmdVersionBuild ), + KNullDesC8, + CPhoneReleaseCommand::NewL( *stateMachine ) ); + } + else + { + stateMachine->SendPhoneEngineMessage( + MPEPhoneModel::EPEMessageRelease ); + } + + ret = ETrue; + } + + return ret; + } + + +// --------------------------------------------------------- +// PhoneCallUtil::IsVideoCall +// --------------------------------------------------------- +// +EXPORT_C TBool PhoneCallUtil::IsVideoCall( const TInt aCallId ) + { + if ( aCallId < 0 ) + { + return EFalse; + } + + return EPECallTypeVideo == StateMachine()->PhoneEngineInfo()-> + CallType( aCallId ); + } + +// --------------------------------------------------------- +// PhoneCallUtil::CallIdByState +// --------------------------------------------------------- +// +EXPORT_C TInt PhoneCallUtil::CallIdByState( const TPEState aCallState ) + { + TPhoneCmdParamCallStateData callStateData; + callStateData.SetCallState( aCallState ); + + ViewCommandHandle()->ExecuteCommand( + EPhoneViewGetCallIdByState, &callStateData ); + + return callStateData.CallId(); + } + +// --------------------------------------------------------- +// PhoneCallUtil::CheckIfCallExists +// --------------------------------------------------------- +// +EXPORT_C TBool PhoneCallUtil::CheckIfCallExists( + const TPEState aCallState, const TPECallType aCallType ) + { + TBool retVal = EFalse; + TInt callId = CallIdByState( aCallState ); + + if ( callId > 0 && + aCallType == StateMachine()->PhoneEngineInfo()-> + CallType( callId ) ) + { + retVal = ETrue; + } + + return retVal; + } + +// ----------------------------------------------------------- +// PhoneCallUtil::IsAnyConnectedCalls +// ----------------------------------------------------------- +// +EXPORT_C TBool PhoneCallUtil::IsAnyConnectedCalls() + { + TBool connectedCall(EFalse); + MPhoneStateMachine* stateMachine = StateMachine(); + + if ( stateMachine->PhoneEngineInfo()->CheckIfCallStateExists( + EPEStateConnected ) || + stateMachine->PhoneEngineInfo()->CheckIfCallStateExists( + EPEStateConnecting ) || + stateMachine->PhoneEngineInfo()->CheckIfCallStateExists( + EPEStateConnectedConference ) ) + { + connectedCall = ETrue; + } + + return connectedCall; + } + +// --------------------------------------------------------- +// PhoneCallUtil::ViewCommandHandle +// --------------------------------------------------------- +// +MPhoneViewCommandHandle* PhoneCallUtil::ViewCommandHandle() + { + return CPhoneStateHandle::Instance()->ViewCommandHandle(); + } + +// --------------------------------------------------------- +// PhoneCallUtil::StateMachine +// --------------------------------------------------------- +// +MPhoneStateMachine* PhoneCallUtil::StateMachine() + { + return CPhoneStateHandle::Instance()->StateMachine(); + } + +// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphoneaccessorybthandler/group/ut_cphoneaccessorybthandler.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphoneaccessorybthandler/group/ut_cphoneaccessorybthandler.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphoneaccessorybthandler/group/ut_cphoneaccessorybthandler.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -124,3 +124,4 @@ LIBRARY CommonEngine.lib +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonenumberentrymanager/group/ut_cphonenumberentrymanager.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonenumberentrymanager/group/ut_cphonenumberentrymanager.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonenumberentrymanager/group/ut_cphonenumberentrymanager.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -112,3 +112,5 @@ LIBRARY symbianmock.lib LIBRARY gdi.lib // TZoomFactor LIBRARY ws32.lib // RWsSession + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestate/group/ut_cphonestate.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/group/ut_cphonestate.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/group/ut_cphonestate.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -43,6 +43,7 @@ SOURCE mock_cphoneaccessorybthandler.cpp SOURCE mock_phonenoteutil.cpp SOURCE mock_phoneaudioutil.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphoneuicommandmanager.cpp @@ -133,3 +134,4 @@ LIBRARY symbianmock.lib LIBRARY hal.lib +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestatecallsetup/group/ut_cphonestatecallsetup.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestatecallsetup/group/ut_cphonestatecallsetup.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestatecallsetup/group/ut_cphonestatecallsetup.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -104,3 +104,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -18,7 +18,7 @@ #include "ut_cphonestateidle.h" #include #include - +#include #include #include #include "cpeengineinfo.h" @@ -56,11 +56,6 @@ MWsClientClass::MWsClientClass() {} RWindowTreeNode::RWindowTreeNode() {} -#include -TApaTaskList::TApaTaskList(RWsSession &aSession ) : iWsSession( aSession ) {} -TApaTask TApaTaskList::FindApp(TUid) {} -TInt TApaTask::Exists() const {return EFalse;} - // needed for mocking CPhoneMainResourceResolver::Instance() class CPhoneMainResourceResolverMock : public CPhoneMainResourceResolver { @@ -137,7 +132,10 @@ void ut_cphonestateidle::SetupL( ) { iMockContext->InitializeL(); - + + RWsSession wsSession; + iTask = new TApaTask(wsSession); + SmcDefaultValue::SetL( *iTask ); iCoeEnvMock = new (ELeave ) CCoeEnv(); SmcDefaultValue::SetL( iCoeEnvMock ); @@ -181,6 +179,9 @@ delete iCoeEnvMock; iCoeEnvMock = NULL; SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); + delete iTask; + iTask = NULL; } @@ -368,7 +369,7 @@ ReturnsL( phoneNumber ); iMockContext->ExpectCallL( "CPEEngineInfoImpl::SetPhoneNumber" ). WithL( KPhoneNumber() ); - iMockContext->ExpectCallL( "CPhoneState::DialMultimediaCallL" ); + iMockContext->ExpectCallL( "CPhoneState::DialMultimediaCall" ); //DialVideoCallL is used via handlecommand because it's private method. iStateIdle->HandleCommandL( EPhoneNumberAcqCmdVideoCall ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.h --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.h Fri Oct 15 12:58:46 2010 +0300 @@ -34,6 +34,7 @@ class CCoeEnv; class CPhoneCustomizationVoip; class TPhoneCommandParam; +class TApaTask; TBool operator==(const TPhoneCommandParam& param1, const TPhoneCommandParam& param2 ); @@ -85,6 +86,7 @@ CPEEngineInfo* iEngineInfoMock; CCoeEnv* iCoeEnvMock; CPhoneCustomizationVoip* iCustomizationMock; + TApaTask* iTask; EUNIT_DECLARE_TEST_TABLE; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/group/ut_cphonestateidle.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/group/ut_cphonestateidle.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/group/ut_cphonestateidle.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -36,7 +36,13 @@ SOURCEPATH ../../../../../internal/mocks/phoneengine/engineinfo SOURCE mock_cpeengineinfoimpl.cpp - + +SOURCEPATH ../../../../../internal/mocks/ +SOURCE mock_apacmdln.cpp +SOURCE mock_apgcli.cpp +SOURCE mock_apgtask.cpp +SOURCE mock_apaid.cpp + // Code under test SOURCEPATH ../../../src SOURCE CPhoneStateIdle.cpp @@ -110,3 +116,5 @@ LIBRARY euser.lib LIBRARY gdi.lib LIBRARY symbianmock.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestateincall/group/ut_cphonestateincall.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateincall/group/ut_cphonestateincall.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateincall/group/ut_cphonestateincall.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -45,6 +45,7 @@ SOURCEPATH ../../../../internal/mocks/phoneuicontrol SOURCE mock_cphonestate.cpp SOURCE mock_cphonestatemachine.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp @@ -126,4 +127,4 @@ LIBRARY sendui.lib // CMessageData LIBRARY charconv.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestateincoming/group/ut_cphonestateincoming.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateincoming/group/ut_cphonestateincoming.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateincoming/group/ut_cphonestateincoming.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -68,6 +68,7 @@ SOURCEPATH ../../../../internal/mocks/phoneuicontrol SOURCE mock_cphonestate.cpp SOURCE mock_cphonestatemachine.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/eikmenupane SOURCE mock_coemain.cpp @@ -134,3 +135,4 @@ LIBRARY gdi.lib LIBRARY symbianmock.lib +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestatestartup/group/ut_cphonestatestartup.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestatestartup/group/ut_cphonestatestartup.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestatestartup/group/ut_cphonestatestartup.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -97,3 +97,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphoneuicommandmanager/Src/ut_cphoneuicommandmanager.cpp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphoneuicommandmanager/Src/ut_cphoneuicommandmanager.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphoneuicommandmanager/Src/ut_cphoneuicommandmanager.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -168,7 +168,8 @@ */ void ut_cphoneuicommandmanager::T_UpdateUiCommands( ) { - /*expect call from SetButtonFlags*/ + /*expect call from SetButtonFlags*/ + iMockContext->ExpectCallL( "PhoneCallUtil::CallIdByState" ).ReturnsL(KErrNotFound); TPhoneCmdParamBoolean muteParam; iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommand" ). WithL ( EPhoneViewSetMuteFlag, muteParam ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphoneuicommandmanager/group/ut_cphoneuicommandmanager.mmp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphoneuicommandmanager/group/ut_cphoneuicommandmanager.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphoneuicommandmanager/group/ut_cphoneuicommandmanager.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -32,6 +32,7 @@ SOURCEPATH ../../../../internal/mocks/phoneuicontrol SOURCE mock_cphonestatemachine.cpp SOURCE mock_cphonestate.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_cphonelogger.cpp @@ -95,3 +96,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/BWINS/ut_phoneaudioutilU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/BWINS/ut_phoneaudioutilU.def Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,2 @@ +EXPORTS + ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * __cdecl CreateTestSuiteL(void) diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/Src/ut_phoneaudioutil.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/Src/ut_phoneaudioutil.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,351 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "ut_phoneaudioutil.h" +#include "phoneaudioutil.h" +#include "phonenoteutil.h" +#include +#include + +#include "CPhoneStateMachineGSM.h" +#include "mock_cphoneviewcommandhandle.h" +#include "CPEEngineInfo.h" +#include "cphonestateincall.h" +#include "cphonestatehandle.h" +#include "CPhoneCenRepProxy.h" +#include "CPhoneMainResourceResolver.h" +#include +#include +#include "phoneui.hrh" +#include +#include +#include +#include +#include "phoneresourceids.h" +#include "phonerssbase.h" +#include "CPhoneTerminateAllConnectionsCommand.h" + +// needed for mocking CPhoneMainResourceResolver::Instance() +class CPhoneMainResourceResolverMock : public CPhoneMainResourceResolver{}; + +class CPhoneStateMachineGSMMock : public CPhoneStateMachineGSM{}; + + + + +// - Construction ----------------------------------------------------------- + +ut_phoneaudioutil* ut_phoneaudioutil::NewL() + { + ut_phoneaudioutil* self = ut_phoneaudioutil::NewLC(); + CleanupStack::Pop(); + return self; + } + +ut_phoneaudioutil* ut_phoneaudioutil::NewLC() + { + ut_phoneaudioutil* self = new( ELeave ) ut_phoneaudioutil(); + CleanupStack::PushL( self ); + self->ConstructL(); + return self; + } + +ut_phoneaudioutil::~ut_phoneaudioutil() + { + CSmcMockContext::Release(); + } + +ut_phoneaudioutil::ut_phoneaudioutil() + { + } + +void ut_phoneaudioutil::ConstructL() + { + CEUnitTestSuiteClass::ConstructL(); + iMockContext = CSmcMockContext::InstanceL(); + } + +// - Test methods ----------------------------------------------------------- + +void ut_phoneaudioutil::SetupL( ) + { + iCPhoneMainResourceResolverMock = new ( ELeave ) CPhoneMainResourceResolverMock(); + SmcDefaultValue::SetL( iCPhoneMainResourceResolverMock ); + + iCoeEnvMock = new (ELeave ) CCoeEnv(); + SmcDefaultValue::SetL( iCoeEnvMock ); + + iViewCommandHandle = new CPhoneViewCommandHandleMock(); + SmcDefaultValue::SetL( iViewCommandHandle ); + + iStateMachine = CPhoneStateMachineGSMMock::NewL(iViewCommandHandle); + SmcDefaultValue::SetL( iStateMachine ); + + iCPhoneStateHandleMock = CPhoneStateHandle:: + CreateL(iViewCommandHandle, _L("test"), TUid::Uid(1)); + SmcDefaultValue::SetL( iCPhoneStateHandleMock ); + + iEngineInfo = CPEEngineInfo::NewL(); + SmcDefaultValue::SetL( iEngineInfo ); + } + +void ut_phoneaudioutil::Teardown( ) + { + delete iStateMachine; + iStateMachine = NULL; + SmcDefaultValue::Reset(); + + delete iCPhoneStateHandleMock; + iCPhoneStateHandleMock = NULL; + SmcDefaultValue::Reset(); + + delete iViewCommandHandle; + iViewCommandHandle = NULL; + SmcDefaultValue::Reset(); + + delete iEngineInfo; + iEngineInfo = NULL; + SmcDefaultValue::Reset(); + + delete iCoeEnvMock; + iCoeEnvMock = NULL; + SmcDefaultValue::Reset(); + + delete iCPhoneMainResourceResolverMock; + iCPhoneMainResourceResolverMock = NULL; + SmcDefaultValue::Reset(); + + iMockContext->Reset(); + } + +void ut_phoneaudioutil::T_ConstructionL( ) + { + // SetupL and Teardown does the test. + } + +void ut_phoneaudioutil::T_HandleAudioMuteChangedL( ) + { + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ); + + PhoneAudioUtil::HandleAudioMuteChangedL(); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phoneaudioutil::T_HandleAudioOutputChangedL( ) + { + PhoneAudioUtil::HandleAudioOutputChangedL(); + + iEngineInfo->SetAudioOutput(EPEBTAudioAccessory, EPEHandset, EFalse); + RArray availableOutputs; + availableOutputs.Append(EPEBTAudioAccessory); + availableOutputs.Append(EPEHandset); + availableOutputs.Append(EPELoudspeaker); + iEngineInfo->SetAvailableAudioOutputs(availableOutputs.Array()); + + iMockContext->ExpectCallL( "CPhoneAccessoryBTHandler::ShowBTActivatedL" ); + PhoneAudioUtil::HandleAudioOutputChangedL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iEngineInfo->SetAudioOutput(EPENotActive, EPEBTAudioAccessory, EFalse); + iMockContext->ExpectCallL( "CPhoneBtaaDisconnectHandler::IsQuery" ).ReturnsL(ETrue); + iMockContext->ExpectCallL( "CPhoneBtaaDisconnectHandler::Cancel" ); + PhoneAudioUtil::HandleAudioOutputChangedL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iEngineInfo->SetAudioOutput(EPELoudspeaker, EPEHandset, EFalse); + iMockContext->ExpectCallL( + "CPhoneViewCommandHandleMock::ExecuteCommandL" ).WithL(EPhoneViewPlayHandsFreeActivatedTone); + PhoneAudioUtil::HandleAudioOutputChangedL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + + availableOutputs.Close(); + } + +void ut_phoneaudioutil::T_ChangeAudioVolumeL( ) + { + iEngineInfo->SetAudioOutput(EPETTY, EPENotActive, EFalse); + iMockContext->ExpectCallL( "PhoneNoteUtil::SendGlobalInfoNoteL" ); + PhoneAudioUtil::DecreaseAudioVolumeL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iMockContext->ExpectCallL( "PhoneNoteUtil::SendGlobalInfoNoteL" ); + PhoneAudioUtil::IncreaseAudioVolumeL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iEngineInfo->SetAudioOutput(EPEHandset, EPENotActive, EFalse); + + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ). + WithL(MPEPhoneModel::EPEMessageSetAudioVolume); + PhoneAudioUtil::IncreaseAudioVolumeL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ). + WithL(MPEPhoneModel::EPEMessageSetAudioVolume); + PhoneAudioUtil::DecreaseAudioVolumeL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ).TimesL(0); + PhoneAudioUtil::ChangeAudioVolumeL( -1, EFalse ); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + + PhoneAudioUtil::GetVolumeLevel(); + } + +void ut_phoneaudioutil::T_HandleAudioAvailableOutputChangedL( ) + { + iEngineInfo->SetAudioOutput(EPEBTAudioAccessory, EPEHandset, EFalse); + RArray availableOutputs; + + availableOutputs.Append(EPEHandset); + availableOutputs.Append(EPELoudspeaker); + iEngineInfo->SetAvailableAudioOutputs(availableOutputs.Array()); + + iMockContext->ExpectCallL( "CPhoneBtaaDisconnectHandler::Cancel" ).TimesL(0); + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ); + PhoneAudioUtil::HandleAudioAvailableOutputChangedL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + availableOutputs.Reset(); + availableOutputs.Append(EPEBTAudioAccessory); + availableOutputs.Append(EPEHandset); + availableOutputs.Append(EPELoudspeaker); + iEngineInfo->SetAvailableAudioOutputs(availableOutputs.Array()); + iMockContext->ExpectCallL( "CPhoneBtaaDisconnectHandler::Cancel" ); + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ); + PhoneAudioUtil::HandleAudioAvailableOutputChangedL(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + availableOutputs.Close(); + } + +void ut_phoneaudioutil::T_ToggleMute( ) + { + iEngineInfo->SetAudioMute(EFalse); + + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ). + WithL(MPEPhoneModel::EPEMessageSetAudioMute); + PhoneAudioUtil::ToggleMute(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + EUNIT_ASSERT( iEngineInfo->AudioMuteCommand() ); + iMockContext->Reset(); + + iEngineInfo->SetAudioMute(ETrue); + + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ). + WithL(MPEPhoneModel::EPEMessageSetAudioMute); + PhoneAudioUtil::ToggleMute(); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + EUNIT_ASSERT( EFalse == iEngineInfo->AudioMuteCommand() ); + iMockContext->Reset(); + } + +void ut_phoneaudioutil::T_SetHandsfreeModeL( ) + { + iMockContext->ExpectCallL( "CPhoneAccessoryBTHandler::SetHandsfreeModeL" ).ReturnsL(ETrue); + iMockContext->ExpectCallL( "PhoneNoteUtil::SendGlobalErrorNoteL" ).TimesL(0); + PhoneAudioUtil::SetHandsfreeModeL( ETrue ); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iMockContext->ExpectCallL( "CPhoneAccessoryBTHandler::SetHandsfreeModeL" ).ReturnsL(EFalse); + iMockContext->ExpectCallL( "PhoneNoteUtil::SendGlobalErrorNoteL" ). + WithL(EPhoneNoteTextNotAllowed ,ETrue); + PhoneAudioUtil::SetHandsfreeModeL( ETrue ); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + + iMockContext->ExpectCallL( "CPhoneAccessoryBTHandler::SetBTHandsfreeModeL" ).ReturnsL(ETrue); + iMockContext->ExpectCallL( "PhoneNoteUtil::SendGlobalErrorNoteL" ).TimesL(0); + PhoneAudioUtil::SetBtHandsfreeModeL( ETrue ); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iMockContext->ExpectCallL( "CPhoneAccessoryBTHandler::SetBTHandsfreeModeL" ).ReturnsL(EFalse); + iMockContext->ExpectCallL( "PhoneNoteUtil::SendGlobalErrorNoteL" ). + WithL(EPhoneNoteTextNotAllowed ,ETrue); + PhoneAudioUtil::SetBtHandsfreeModeL( ETrue ); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + } + +// - EUnit test table ------------------------------------------------------- + +EUNIT_BEGIN_TEST_TABLE( + ut_phoneaudioutil, + "Add test suite description here.", + "UNIT" ) + +EUNIT_TEST( + "Test0", + "T_ConstructionL", + "Test0", + "FUNCTIONALITY", + SetupL, T_ConstructionL, Teardown) + +EUNIT_TEST( + "Test1", + "T_HandleAudioMuteChangedL", + "Test1", + "FUNCTIONALITY", + SetupL, T_HandleAudioMuteChangedL, Teardown) + +EUNIT_TEST( + "Test2", + "T_HandleAudioOutputChangedL", + "Test2", + "FUNCTIONALITY", + SetupL, T_HandleAudioOutputChangedL, Teardown) + +EUNIT_TEST( + "Test3", + "T_ChangeAudioVolumeL", + "Test3", + "FUNCTIONALITY", + SetupL, T_ChangeAudioVolumeL, Teardown) + +EUNIT_TEST( + "Test4", + "T_HandleAudioAvailableOutputChangedL", + "Test4", + "FUNCTIONALITY", + SetupL, T_HandleAudioAvailableOutputChangedL, Teardown) + +EUNIT_TEST( + "Test5", + "T_ToggleMute", + "Test5", + "FUNCTIONALITY", + SetupL, T_ToggleMute, Teardown) + +EUNIT_TEST( + "Test6", + "T_SetHandsfreeModeL", + "Test6", + "FUNCTIONALITY", + SetupL, T_SetHandsfreeModeL, Teardown) + +EUNIT_END_TEST_TABLE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/Src/ut_phoneaudioutil.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/Src/ut_phoneaudioutil.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,82 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef __UT_PHONEAUDIOUTIL_H__ +#define __UT_PHONEAUDIOUTIL_H__ + +// INCLUDES +#include +#include + + + +// FORWARD DECLARATIONS +class CPhoneViewCommandHandleMock; +class CCoeEnv; +class CPhoneStateMachineGSM; +class CPEEngineInfo; +class CPhoneMainResourceResolverMock; +class CSmcMockContext; +class CPhoneStateHandle; + +// CLASS DEFINITION +/** + * Generated EUnit test suite class. + */ +NONSHARABLE_CLASS( ut_phoneaudioutil ) + : public CEUnitTestSuiteClass + { + public: // Constructors and destructor + + static ut_phoneaudioutil* NewL(); + static ut_phoneaudioutil* NewLC(); + ~ut_phoneaudioutil(); + + private: // Constructors + + ut_phoneaudioutil(); + void ConstructL(); + + private: // New methods + + void SetupL(); + void Teardown(); + + void T_ConstructionL(); + void T_HandleAudioMuteChangedL(); + void T_HandleAudioOutputChangedL(); + void T_ChangeAudioVolumeL(); + void T_HandleAudioAvailableOutputChangedL(); + void T_ToggleMute(); + void T_SetHandsfreeModeL(); + + + private: // Data + + CPhoneViewCommandHandleMock* iViewCommandHandle; + CPhoneStateHandle* iCPhoneStateHandleMock; + CCoeEnv* iCoeEnvMock; + CPhoneStateMachineGSM* iStateMachine; + CPEEngineInfo* iEngineInfo; + CSmcMockContext* iMockContext; + CPhoneMainResourceResolverMock* iCPhoneMainResourceResolverMock; + + EUNIT_DECLARE_TEST_TABLE; + + }; + +#endif // __UT_PHONEAUDIOUTIL_H__ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/Src/ut_phoneaudioutil_DllMain.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/Src/ut_phoneaudioutil_DllMain.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "ut_phoneaudioutil.h" +#include + +EXPORT_C MEUnitTest* CreateTestSuiteL() + { + return ut_phoneaudioutil::NewL(); + } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/group/bld.inf Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,31 @@ +/* +* 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: +* +*/ + + +PRJ_PLATFORMS + DEFAULT + +PRJ_EXPORTS + +PRJ_MMPFILES + + +PRJ_TESTMMPFILES +ut_phoneaudioutil.mmp + + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/group/ut_phoneaudioutil.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phoneaudioutil/group/ut_phoneaudioutil.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,135 @@ +/* +* 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 +#include +#include + +TARGET ut_phoneaudioutil.dll +TARGETTYPE dll +UID 0x1000af5a 0x01700000 + +CAPABILITY EUNIT_CAPS +VENDORID VID_DEFAULT + +SOURCEPATH ../Src +SOURCE ut_phoneaudioutil.cpp + +// Sources required by the test suite +SOURCEPATH ../Src +SOURCE ut_phoneaudioutil_DllMain.cpp + +//SOURCEPATH ../../../../../phoneengine/engineinfo/src +//SOURCE cpeengineinfo.cpp + +// Code under test +SOURCEPATH ../../../src +SOURCE phoneaudioutil.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_cphonestate.cpp +SOURCE mock_cphonestatemachine.cpp +SOURCE mock_cphonestatehandle.cpp +SOURCE mock_cphoneaccessorybthandler.cpp +SOURCE mock_phonenoteutil.cpp + +SOURCEPATH ../../../../internal/mocks/ +SOURCE mock_cphonebtaadisconnecthandler.cpp + +SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol +SOURCE mock_cphonenumberentrymanager.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuistates +SOURCE mock_cphonestatemachinegsm.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuiview +SOURCE mock_cphoneviewcommandhandle.cpp + +SOURCEPATH ../../../../../internal/mocks/phoneengine/engineinfo +SOURCE mock_cpeengineinfoimpl.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuiutils +SOURCE mock_cphonemainresourceresolver.cpp +SOURCE mock_cphonelogger.cpp +SOURCE mock_cphonepubsubproxy.cpp +SOURCE mock_cphonecenrepproxy.cpp +SOURCE mock_cphonekeys.cpp +SOURCE mock_tphonecmdparamboolean.cpp +SOURCE mock_tphonecmdparaminteger.cpp +SOURCE mock_tphonecommandparam.cpp +SOURCE mock_tphonecmdparamappinfo.cpp + +SOURCEPATH ../../../../internal/mocks/ +SOURCE mock_featmgr.cpp +SOURCE mock_StringLoader.cpp +SOURCE mock_basched.cpp + +SOURCEPATH ../../../../internal/mocks/phonemediatorcenter +SOURCE mock_cphoneterminateallconnectionscommand.cpp +SOURCE mock_cphonemediatorfactory.cpp +SOURCE mock_cphonemediatorsender.cpp +SOURCE mock_cphonereleasecommand.cpp +SOURCE mock_cphonecontinueemergencycallcommand.cpp + +SOURCEPATH ../../../../../internal/mocks/eikmenupane +SOURCE mock_eikmenup.cpp +SOURCE mock_eikmenub.cpp +SOURCE mock_coecntrl.cpp +SOURCE mock_eikbctrl.cpp +SOURCE mock_coemop.cpp +SOURCE mock_coeinput.cpp +SOURCE mock_gulbordr.cpp +SOURCE mock_akncontrol.cpp +SOURCE mock_eikcmobs.cpp +SOURCE mock_coemain.cpp +SOURCE mock_eikenv.cpp +SOURCE mock_eikvcurs.cpp + +USERINCLUDE ../../../../../phoneengine/engineinfo/inc +USERINCLUDE ../../../../phoneuiview/inc +USERINCLUDE ../../../../phoneuicontrol/inc +USERINCLUDE ../../../../phoneuistates/inc +USERINCLUDE ../../../../phoneuiutils/inc +USERINCLUDE ../../../../phoneui2/srcdata +USERINCLUDE ../../../../phonemediatorcenter/inc +USERINCLUDE ../../../../phoneuiqtviewadapter/inc +USERINCLUDE ../../../../internal/mocks/phoneuiview + +APP_LAYER_SYSTEMINCLUDE +SYSTEMINCLUDE /epoc32/include/platform/mw/graphics/uigraphicsutils/ +SYSTEMINCLUDE ../../../inc // phoneuicontrol inc +SYSTEMINCLUDE /epoc32/include/Digia/EUnit +SYSTEMINCLUDE ../../../../../inc // phone internal headers + +LIBRARY phoneuiutils.lib +LIBRARY EUnit.lib +LIBRARY EUnitUtil.lib +LIBRARY euser.lib +LIBRARY CentralRepository.lib +LIBRARY symbianmock.lib +LIBRARY efsrv.lib +LIBRARY gdi.lib // TZoomFactor +LIBRARY ws32.lib // RWsSession +LIBRARY apgrfx.lib +LIBRARY fbscli.lib +LIBRARY ConnMon.lib // RConnectionMonitor +LIBRARY sendui.lib // CMessageData +LIBRARY charconv.lib +LIBRARY engineinfo.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/BWINS/ut_phonecallutilU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/BWINS/ut_phonecallutilU.def Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,2 @@ +EXPORTS + ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * __cdecl CreateTestSuiteL(void) diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/Src/ut_phonecallutil.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/Src/ut_phonecallutil.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,238 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "ut_phonecallutil.h" +#include "phonecallutil.h" +#include +#include + +#include "CPhoneStateMachineGSM.h" +#include "mock_cphoneviewcommandhandle.h" +#include "CPEEngineInfo.h" +#include "cphonestateincall.h" +#include "cphonestatehandle.h" +#include "CPhoneCenRepProxy.h" +#include "CPhoneMainResourceResolver.h" +#include +#include +#include "phoneui.hrh" +#include +#include +#include +#include +#include "phoneresourceids.h" +#include "phonerssbase.h" +#include "CPhoneTerminateAllConnectionsCommand.h" + +// needed for mocking CPhoneMainResourceResolver::Instance() +class CPhoneMainResourceResolverMock : public CPhoneMainResourceResolver{}; + +class CPhoneStateMachineGSMMock : public CPhoneStateMachineGSM{}; + + + + +// - Construction ----------------------------------------------------------- + +ut_phonecallutil* ut_phonecallutil::NewL() + { + ut_phonecallutil* self = ut_phonecallutil::NewLC(); + CleanupStack::Pop(); + return self; + } + +ut_phonecallutil* ut_phonecallutil::NewLC() + { + ut_phonecallutil* self = new( ELeave ) ut_phonecallutil(); + CleanupStack::PushL( self ); + self->ConstructL(); + return self; + } + +ut_phonecallutil::~ut_phonecallutil() + { + CSmcMockContext::Release(); + } + +ut_phonecallutil::ut_phonecallutil() + { + } + +void ut_phonecallutil::ConstructL() + { + CEUnitTestSuiteClass::ConstructL(); + iMockContext = CSmcMockContext::InstanceL(); + } + +// - Test methods ----------------------------------------------------------- + +void ut_phonecallutil::SetupL( ) + { + iCPhoneMainResourceResolverMock = new ( ELeave ) CPhoneMainResourceResolverMock(); + SmcDefaultValue::SetL( iCPhoneMainResourceResolverMock ); + + iCoeEnvMock = new (ELeave ) CCoeEnv(); + SmcDefaultValue::SetL( iCoeEnvMock ); + + iViewCommandHandle = new CPhoneViewCommandHandleMock(); + SmcDefaultValue::SetL( iViewCommandHandle ); + + iStateMachine = CPhoneStateMachineGSMMock::NewL(iViewCommandHandle); + SmcDefaultValue::SetL( iStateMachine ); + + iCPhoneStateHandleMock = CPhoneStateHandle:: + CreateL(iViewCommandHandle, _L("test"), TUid::Uid(1)); + SmcDefaultValue::SetL( iCPhoneStateHandleMock ); + + iEngineInfo = CPEEngineInfo::NewL(); + SmcDefaultValue::SetL( iEngineInfo ); + } + +void ut_phonecallutil::Teardown( ) + { + delete iStateMachine; + iStateMachine = NULL; + SmcDefaultValue::Reset(); + + delete iCPhoneStateHandleMock; + iCPhoneStateHandleMock = NULL; + SmcDefaultValue::Reset(); + + delete iViewCommandHandle; + iViewCommandHandle = NULL; + SmcDefaultValue::Reset(); + + delete iEngineInfo; + iEngineInfo = NULL; + SmcDefaultValue::Reset(); + + delete iCoeEnvMock; + iCoeEnvMock = NULL; + SmcDefaultValue::Reset(); + + delete iCPhoneMainResourceResolverMock; + iCPhoneMainResourceResolverMock = NULL; + SmcDefaultValue::Reset(); + + iMockContext->Reset(); + } + +void ut_phonecallutil::T_ConstructionL( ) + { + // SetupL and Teardown does the test. + } + +void ut_phonecallutil::T_DialMultimediaCall( ) + { + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ). + WithL(MPEPhoneModel::EPEMessageDial); + + PhoneCallUtil::DialMultimediaCall(); + + EUNIT_ASSERT_EQUALS( iEngineInfo->CallTypeCommand(), EPECallTypeVideo ); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phonecallutil::T_DialVoiceCall( ) + { + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ). + WithL(MPEPhoneModel::EPEMessageDial); + + PhoneCallUtil::DialVoiceCallL(); + + EUNIT_ASSERT_EQUALS( iEngineInfo->CallTypeCommand(), EPECallTypeCSVoice ); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phonecallutil::T_DisconnectCallL( ) + { + iMockContext->ExpectCallL( "CPhoneStateMachine::SendPhoneEngineMessage" ). + WithL(MPEPhoneModel::EPEMessageRelease); + + PhoneCallUtil::DisconnectCallL(); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phonecallutil::T_TestUtilsL( ) + { + TInt callId = 1; + TInt invalidCallId = -1; + + iEngineInfo->SetCallType(EPECallTypeCSVoice, callId); + EUNIT_ASSERT( EFalse == PhoneCallUtil::IsVideoCall( callId ) ); + EUNIT_ASSERT( EFalse == PhoneCallUtil::IsVideoCall( invalidCallId ) ); + + iEngineInfo->SetCallType(EPECallTypeVideo, callId); + EUNIT_ASSERT( PhoneCallUtil::IsVideoCall( callId ) ); + + EUNIT_ASSERT( -1 == PhoneCallUtil::CallIdByState( EPEStateHeld ) ); + EUNIT_ASSERT( EFalse == PhoneCallUtil::CheckIfCallExists( + EPEStateHeld, EPECallTypeCSVoice) ); + + EUNIT_ASSERT( EFalse == PhoneCallUtil::IsAnyConnectedCalls() ); + iEngineInfo->SetCallState(EPEStateConnected, callId); + EUNIT_ASSERT( PhoneCallUtil::IsAnyConnectedCalls() ); + iEngineInfo->SetCallState(EPEStateConnecting, callId); + EUNIT_ASSERT( PhoneCallUtil::IsAnyConnectedCalls() ); + iEngineInfo->SetCallState(EPEStateConnectedConference, callId); + EUNIT_ASSERT( PhoneCallUtil::IsAnyConnectedCalls() ); + } + +// - EUnit test table ------------------------------------------------------- + +EUNIT_BEGIN_TEST_TABLE( + ut_phonecallutil, + "Add test suite description here.", + "UNIT" ) + +EUNIT_TEST( + "Test0", + "T_ConstructionL", + "Test0", + "FUNCTIONALITY", + SetupL, T_ConstructionL, Teardown) + +EUNIT_TEST( + "Test1", + "T_DialMultimediaCall", + "Test1", + "FUNCTIONALITY", + SetupL, T_DialMultimediaCall, Teardown) + +EUNIT_TEST( + "Test2", + "T_DialVoiceCall", + "Test2", + "FUNCTIONALITY", + SetupL, T_DialVoiceCall, Teardown) + +EUNIT_TEST( + "Test3", + "T_DisconnectCallL", + "Test3", + "FUNCTIONALITY", + SetupL, T_DisconnectCallL, Teardown) + +EUNIT_TEST( + "Test4", + "T_TestUtilsL", + "Test4", + "FUNCTIONALITY", + SetupL, T_TestUtilsL, Teardown) + +EUNIT_END_TEST_TABLE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/Src/ut_phonecallutil.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/Src/ut_phonecallutil.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,80 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef __UT_CPHONECALLUTIL_H__ +#define __UT_CPHONECALLUTIL_H__ + +// INCLUDES +#include +#include + + + +// FORWARD DECLARATIONS +class CPhoneViewCommandHandleMock; +class CCoeEnv; +class CPhoneStateMachineGSM; +class CPEEngineInfo; +class CPhoneMainResourceResolverMock; +class CSmcMockContext; +class CPhoneStateHandle; + +// CLASS DEFINITION +/** + * Generated EUnit test suite class. + */ +NONSHARABLE_CLASS( ut_phonecallutil ) + : public CEUnitTestSuiteClass + { + public: // Constructors and destructor + + static ut_phonecallutil* NewL(); + static ut_phonecallutil* NewLC(); + ~ut_phonecallutil(); + + private: // Constructors + + ut_phonecallutil(); + void ConstructL(); + + private: // New methods + + void SetupL(); + void Teardown(); + + void T_ConstructionL(); + void T_DialMultimediaCall(); + void T_DialVoiceCall(); + void T_DisconnectCallL(); + void T_TestUtilsL(); + + + private: // Data + + CPhoneViewCommandHandleMock* iViewCommandHandle; + CPhoneStateHandle* iCPhoneStateHandleMock; + CCoeEnv* iCoeEnvMock; + CPhoneStateMachineGSM* iStateMachine; + CPEEngineInfo* iEngineInfo; + CSmcMockContext* iMockContext; + CPhoneMainResourceResolverMock* iCPhoneMainResourceResolverMock; + + EUNIT_DECLARE_TEST_TABLE; + + }; + +#endif // __UT_CPHONECALLUTIL_H__ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/Src/ut_phonecallutil_DllMain.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/Src/ut_phonecallutil_DllMain.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "ut_phonecallutil.h" +#include + +EXPORT_C MEUnitTest* CreateTestSuiteL() + { + return ut_phonecallutil::NewL(); + } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/group/bld.inf Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,31 @@ +/* +* 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: +* +*/ + + +PRJ_PLATFORMS + DEFAULT + +PRJ_EXPORTS + +PRJ_MMPFILES + + +PRJ_TESTMMPFILES +ut_phonecallutil.mmp + + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/group/ut_phonecallutil.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonecallutil/group/ut_phonecallutil.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,130 @@ +/* +* 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 +#include +#include + +TARGET ut_phonecallutil.dll +TARGETTYPE dll +UID 0x1000af5a 0x01700000 + +CAPABILITY EUNIT_CAPS +VENDORID VID_DEFAULT + +SOURCEPATH ../Src +SOURCE ut_phonecallutil.cpp + +// Sources required by the test suite +SOURCEPATH ../Src +SOURCE ut_phonecallutil_DllMain.cpp + +//SOURCEPATH ../../../../../phoneengine/engineinfo/src +//SOURCE cpeengineinfo.cpp + +// Code under test +SOURCEPATH ../../../src +SOURCE phonecallutil.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_cphonestate.cpp +SOURCE mock_cphonestatemachine.cpp +SOURCE mock_cphonestatehandle.cpp + +SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol +SOURCE mock_cphonenumberentrymanager.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuistates +SOURCE mock_cphonestatemachinegsm.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuiview +SOURCE mock_cphoneviewcommandhandle.cpp + +SOURCEPATH ../../../../../internal/mocks/phoneengine/engineinfo +SOURCE mock_cpeengineinfoimpl.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuiutils +SOURCE mock_cphonemainresourceresolver.cpp +SOURCE mock_cphonelogger.cpp +SOURCE mock_cphonepubsubproxy.cpp +SOURCE mock_cphonecenrepproxy.cpp +SOURCE mock_cphonekeys.cpp +SOURCE mock_tphonecmdparamboolean.cpp +SOURCE mock_tphonecmdparaminteger.cpp +SOURCE mock_tphonecommandparam.cpp +SOURCE mock_tphonecmdparamappinfo.cpp + +SOURCEPATH ../../../../internal/mocks/ +SOURCE mock_featmgr.cpp +SOURCE mock_StringLoader.cpp +SOURCE mock_basched.cpp + +SOURCEPATH ../../../../internal/mocks/phonemediatorcenter +SOURCE mock_cphoneterminateallconnectionscommand.cpp +SOURCE mock_cphonemediatorfactory.cpp +SOURCE mock_cphonemediatorsender.cpp +SOURCE mock_cphonereleasecommand.cpp +SOURCE mock_cphonecontinueemergencycallcommand.cpp + +SOURCEPATH ../../../../../internal/mocks/eikmenupane +SOURCE mock_eikmenup.cpp +SOURCE mock_eikmenub.cpp +SOURCE mock_coecntrl.cpp +SOURCE mock_eikbctrl.cpp +SOURCE mock_coemop.cpp +SOURCE mock_coeinput.cpp +SOURCE mock_gulbordr.cpp +SOURCE mock_akncontrol.cpp +SOURCE mock_eikcmobs.cpp +SOURCE mock_coemain.cpp +SOURCE mock_eikenv.cpp +SOURCE mock_eikvcurs.cpp + +USERINCLUDE ../../../../../phoneengine/engineinfo/inc +USERINCLUDE ../../../../phoneuiview/inc +USERINCLUDE ../../../../phoneuicontrol/inc +USERINCLUDE ../../../../phoneuistates/inc +USERINCLUDE ../../../../phoneuiutils/inc +USERINCLUDE ../../../../phoneui2/srcdata +USERINCLUDE ../../../../phonemediatorcenter/inc +USERINCLUDE ../../../../phoneuiqtviewadapter/inc +USERINCLUDE ../../../../internal/mocks/phoneuiview + +APP_LAYER_SYSTEMINCLUDE +SYSTEMINCLUDE /epoc32/include/platform/mw/graphics/uigraphicsutils/ +SYSTEMINCLUDE ../../../inc // phoneuicontrol inc +SYSTEMINCLUDE /epoc32/include/Digia/EUnit +SYSTEMINCLUDE ../../../../../inc // phone internal headers + +LIBRARY phoneuiutils.lib +LIBRARY EUnit.lib +LIBRARY EUnitUtil.lib +LIBRARY euser.lib +LIBRARY CentralRepository.lib +LIBRARY symbianmock.lib +LIBRARY efsrv.lib +LIBRARY gdi.lib // TZoomFactor +LIBRARY ws32.lib // RWsSession +LIBRARY apgrfx.lib +LIBRARY fbscli.lib +LIBRARY ConnMon.lib // RConnectionMonitor +LIBRARY sendui.lib // CMessageData +LIBRARY charconv.lib +LIBRARY engineinfo.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/BWINS/ut_phonenoteutilU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/BWINS/ut_phonenoteutilU.def Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,2 @@ +EXPORTS + ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * __cdecl CreateTestSuiteL(void) diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/Src/ut_phonenoteutil.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/Src/ut_phonenoteutil.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,380 @@ +/* +* Copyright (c) 2020 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "ut_phonenoteutil.h" +#include "phonenoteutil.h" +#include +#include + +#include "CPhoneStateMachineGSM.h" +#include "mock_cphoneviewcommandhandle.h" +#include "CPEEngineInfo.h" +#include "cphonestateincall.h" +#include "cphonestatehandle.h" +#include "CPhoneCenRepProxy.h" +#include "CPhoneMainResourceResolver.h" +#include "tphonecmdparamnote.h" +#include "tphonecmdparamquery.h" +#include +#include +#include "phoneui.hrh" +#include +#include +#include +#include +#include "phoneresourceids.h" +#include "phonerssbase.h" +#include "CPhoneTerminateAllConnectionsCommand.h" +#include "CPhoneMainErrorMessagesHandler.h" + +// needed for mocking CPhoneMainResourceResolver::Instance() +class CPhoneMainResourceResolverMock : public CPhoneMainResourceResolver{}; + +class CPhoneMainErrorMessagesHandlerMock : public CPhoneMainErrorMessagesHandler + { + + }; + +class CPhoneStateMachineGSMMock : public CPhoneStateMachineGSM{}; + + + + +// - Construction ----------------------------------------------------------- + +ut_phonenoteutil* ut_phonenoteutil::NewL() + { + ut_phonenoteutil* self = ut_phonenoteutil::NewLC(); + CleanupStack::Pop(); + return self; + } + +ut_phonenoteutil* ut_phonenoteutil::NewLC() + { + ut_phonenoteutil* self = new( ELeave ) ut_phonenoteutil(); + CleanupStack::PushL( self ); + self->ConstructL(); + return self; + } + +ut_phonenoteutil::~ut_phonenoteutil() + { + CSmcMockContext::Release(); + } + +ut_phonenoteutil::ut_phonenoteutil() + { + } + +void ut_phonenoteutil::ConstructL() + { + CEUnitTestSuiteClass::ConstructL(); + iMockContext = CSmcMockContext::InstanceL(); + } + +// - Test methods ----------------------------------------------------------- + +void ut_phonenoteutil::SetupL( ) + { + iCPhoneMainResourceResolverMock = new ( ELeave ) CPhoneMainResourceResolverMock(); + SmcDefaultValue::SetL( iCPhoneMainResourceResolverMock ); + + iCoeEnvMock = new (ELeave ) CCoeEnv(); + SmcDefaultValue::SetL( iCoeEnvMock ); + + iViewCommandHandle = new CPhoneViewCommandHandleMock(); + SmcDefaultValue::SetL( iViewCommandHandle ); + + iStateMachine = CPhoneStateMachineGSMMock::NewL(iViewCommandHandle); + SmcDefaultValue::SetL( iStateMachine ); + + iCPhoneStateHandleMock = CPhoneStateHandle:: + CreateL(iViewCommandHandle, _L("test"), TUid::Uid(1)); + SmcDefaultValue::SetL( iCPhoneStateHandleMock ); + + iCPhoneMainErrorMessagesHandlerMock = new ( ELeave ) CPhoneMainErrorMessagesHandlerMock(); + SmcDefaultValue::SetL( iCPhoneMainErrorMessagesHandlerMock ); + + iEngineInfo = CPEEngineInfo::NewL(); + SmcDefaultValue::SetL( iEngineInfo ); + } + +void ut_phonenoteutil::Teardown( ) + { + delete iStateMachine; + iStateMachine = NULL; + SmcDefaultValue::Reset(); + + delete iCPhoneStateHandleMock; + iCPhoneStateHandleMock = NULL; + SmcDefaultValue::Reset(); + + delete iViewCommandHandle; + iViewCommandHandle = NULL; + SmcDefaultValue::Reset(); + + delete iEngineInfo; + iEngineInfo = NULL; + SmcDefaultValue::Reset(); + + delete iCoeEnvMock; + iCoeEnvMock = NULL; + SmcDefaultValue::Reset(); + + delete iCPhoneMainResourceResolverMock; + iCPhoneMainResourceResolverMock = NULL; + SmcDefaultValue::Reset(); + + delete iCPhoneMainErrorMessagesHandlerMock; + iCPhoneMainErrorMessagesHandlerMock = NULL; + SmcDefaultValue::Reset(); + + iMockContext->Reset(); + } + +void ut_phonenoteutil::T_ConstructionL( ) + { + // SetupL and Teardown does the test. + } + +void ut_phonenoteutil::T_SendGlobalInfoNoteL( ) + { + TInt resource = 10; + TBool notification = ETrue; + + TPhoneCmdParamGlobalNote globalNoteParam; + iMockContext->ExpectCallL( "CPhoneMainResourceResolver::ResolveResourceID" ). + WithL(resource). + ReturnsL(resource); + + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowGlobalNote, globalNoteParam ); + + PhoneNoteUtil::SendGlobalInfoNoteL( resource, notification); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + iMockContext->ExpectCallL( "CPhoneMainResourceResolver::ResolveResourceID" ). + WithL(resource). + ReturnsL(resource); + + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowGlobalNote, globalNoteParam ); + + PhoneNoteUtil::SendGlobalNoteL( resource, notification); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phonenoteutil::T_SendGlobalWarningNoteL( ) + { + TInt resource = 10; + TBool notification = ETrue; + + TPhoneCmdParamGlobalNote globalNoteParam; + iMockContext->ExpectCallL( "CPhoneMainResourceResolver::ResolveResourceID" ). + WithL(resource). + ReturnsL(resource); + + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowGlobalNote, globalNoteParam ); + + PhoneNoteUtil::SendGlobalWarningNoteL( resource, notification); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phonenoteutil::T_SendGlobalErrorNoteL( ) + { + TInt resource = 10; + TBool notification = ETrue; + + TPhoneCmdParamGlobalNote globalNoteParam; + iMockContext->ExpectCallL( "CPhoneMainResourceResolver::ResolveResourceID" ). + WithL(resource). + ReturnsL(resource); + + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowGlobalNote, globalNoteParam ); + + PhoneNoteUtil::SendGlobalErrorNoteL( resource, notification); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phonenoteutil::T_SendGlobalNoteL2( ) + { + _LIT(KTestText,"test"); + + TPhoneCmdParamGlobalNote globalNoteParam; + + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowGlobalNote, globalNoteParam ); + + PhoneNoteUtil::SendGlobalNoteL( EPhoneNotificationDialog, KTestText()); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +void ut_phonenoteutil::T_ShowNoteAndQueryL( ) + { + TInt resource = 10; + TPhoneCmdParamNote noteParam; + TPhoneCmdParamQuery queryParam; + + // Test ShowNoteL + iMockContext->ExpectCallL( "CPhoneMainResourceResolver::ResolveResourceID" ). + WithL(resource). + ReturnsL(resource); + + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowNote, noteParam ); + + PhoneNoteUtil::ShowNoteL( resource ); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + // Test ShowQueryL + iMockContext->ExpectCallL( "CPhoneMainResourceResolver::ResolveResourceID" ). + WithL(resource). + ReturnsL(resource); + + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowQuery, queryParam ); + + PhoneNoteUtil::ShowQueryL( resource ); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + HBufC* emptyString = HBufC::NewLC( KPhoneNumberEntryBufferSize ); + TPtr ptr( emptyString->Des() ); + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL ( EPhoneViewShowQuery, queryParam ); + + PhoneNoteUtil::ShowTextQueryL(resource,resource,resource,&ptr,ETrue); + + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + CleanupStack::PopAndDestroy( emptyString ); + } + +void ut_phonenoteutil::T_HandleErrorL( ) + { + TPEErrorInfo errorInfo; + + iMockContext->ExpectCallL( "CPhoneMainErrorMessagesHandler::ShowErrorSpecificNoteL" ). + WithL ( errorInfo ); + iMockContext->ExpectCallL( "CPhoneClearBlacklist::ClearBlackListOnNextKey" ); + PhoneNoteUtil::HandleErrorL(errorInfo); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + errorInfo.iErrorCode = ECCPErrorNoService; + iMockContext->ExpectCallL( "CPhoneMainErrorMessagesHandler::ShowErrorSpecificNoteL" ). + WithL ( errorInfo ); + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL( EPhoneViewHideNaviPaneAudioVolume ); + iMockContext->ExpectCallL( "CPhoneClearBlacklist::ClearBlackListOnNextKey" ); + PhoneNoteUtil::HandleErrorL(errorInfo); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + + errorInfo.iErrorCode = ECCPErrorSatControl; + iMockContext->ExpectCallL( "CPhoneMainErrorMessagesHandler::ShowErrorSpecificNoteL" ). + WithL ( errorInfo ); + iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ). + WithL( EPhoneViewClearNumberEntryContent ); + iMockContext->ExpectCallL( "CPhoneClearBlacklist::ClearBlackListOnNextKey" ); + PhoneNoteUtil::HandleErrorL(errorInfo); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + iMockContext->Reset(); + } + +void ut_phonenoteutil::T_HandleRemoteBusyNoteL( ) + { + TInt callId = 1; + iMockContext->ExpectCallL( "CPhoneMainErrorMessagesHandler::ShowErrorSpecificNoteL" ); + PhoneNoteUtil::HandleRemoteBusyNoteL(callId); + EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() ); + } + +// - EUnit test table ------------------------------------------------------- + +EUNIT_BEGIN_TEST_TABLE( + ut_phonenoteutil, + "Add test suite description here.", + "UNIT" ) + +EUNIT_TEST( + "Test0", + "T_ConstructionL", + "Test0", + "FUNCTIONALITY", + SetupL, T_ConstructionL, Teardown) + +EUNIT_TEST( + "Test1", + "T_SendGlobalInfoNoteL", + "Test1", + "FUNCTIONALITY", + SetupL, T_SendGlobalInfoNoteL, Teardown) + +EUNIT_TEST( + "Test2", + "T_SendGlobalWarningNoteL", + "Test2", + "FUNCTIONALITY", + SetupL, T_SendGlobalWarningNoteL, Teardown) + +EUNIT_TEST( + "Test3", + "T_SendGlobalErrorNoteL", + "Test3", + "FUNCTIONALITY", + SetupL, T_SendGlobalErrorNoteL, Teardown) + +EUNIT_TEST( + "Test4", + "T_SendGlobalNoteL2", + "Test4", + "FUNCTIONALITY", + SetupL, T_SendGlobalNoteL2, Teardown) + +EUNIT_TEST( + "Test5", + "T_ShowNoteAndQueryL", + "Test5", + "FUNCTIONALITY", + SetupL, T_ShowNoteAndQueryL, Teardown) + +EUNIT_TEST( + "Test6", + "T_HandleRemoteBusyNoteL", + "Test6", + "FUNCTIONALITY", + SetupL, T_HandleRemoteBusyNoteL, Teardown) + +EUNIT_TEST( + "Test7", + "T_HandleErrorL", + "Test7", + "FUNCTIONALITY", + SetupL, T_HandleErrorL, Teardown) + +EUNIT_END_TEST_TABLE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/Src/ut_phonenoteutil.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/Src/ut_phonenoteutil.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,85 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef __UT_PHONENOTEUTIL_H__ +#define __UT_PHONENOTEUTIL_H__ + +// INCLUDES +#include +#include + + + +// FORWARD DECLARATIONS +class CPhoneViewCommandHandleMock; +class CCoeEnv; +class CPhoneStateMachineGSM; +class CPEEngineInfo; +class CPhoneMainResourceResolverMock; +class CSmcMockContext; +class CPhoneStateHandle; +class CPhoneMainErrorMessagesHandler; + +// CLASS DEFINITION +/** + * Generated EUnit test suite class. + */ +NONSHARABLE_CLASS( ut_phonenoteutil ) + : public CEUnitTestSuiteClass + { + public: // Constructors and destructor + + static ut_phonenoteutil* NewL(); + static ut_phonenoteutil* NewLC(); + ~ut_phonenoteutil(); + + private: // Constructors + + ut_phonenoteutil(); + void ConstructL(); + + private: // New methods + + void SetupL(); + void Teardown(); + + void T_ConstructionL(); + void T_SendGlobalInfoNoteL(); + void T_SendGlobalWarningNoteL(); + void T_SendGlobalErrorNoteL(); + void T_SendGlobalNoteL2(); + void T_ShowNoteAndQueryL(); + void T_HandleErrorL(); + void T_HandleRemoteBusyNoteL(); + + + private: // Data + + CPhoneViewCommandHandleMock* iViewCommandHandle; + CPhoneStateHandle* iCPhoneStateHandleMock; + CCoeEnv* iCoeEnvMock; + CPhoneStateMachineGSM* iStateMachine; + CPEEngineInfo* iEngineInfo; + CSmcMockContext* iMockContext; + CPhoneMainResourceResolverMock* iCPhoneMainResourceResolverMock; + CPhoneMainErrorMessagesHandler* iCPhoneMainErrorMessagesHandlerMock; + + EUNIT_DECLARE_TEST_TABLE; + + }; + +#endif // __UT_PHONENOTEUTIL_H__ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/Src/ut_phonenoteutil_DllMain.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/Src/ut_phonenoteutil_DllMain.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "ut_phonenoteutil.h" +#include + +EXPORT_C MEUnitTest* CreateTestSuiteL() + { + return ut_phonenoteutil::NewL(); + } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/group/bld.inf Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,31 @@ +/* +* 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: +* +*/ + + +PRJ_PLATFORMS + DEFAULT + +PRJ_EXPORTS + +PRJ_MMPFILES + + +PRJ_TESTMMPFILES +ut_phonenoteutil.mmp + + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/group/ut_phonenoteutil.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/tsrc/ut_phonenoteutil/group/ut_phonenoteutil.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,136 @@ +/* +* 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 +#include +#include + +TARGET ut_phonenoteutil.dll +TARGETTYPE dll +UID 0x1000af5a 0x01700000 + +CAPABILITY EUNIT_CAPS +VENDORID VID_DEFAULT + +SOURCEPATH ../Src +SOURCE ut_phonenoteutil.cpp + +// Sources required by the test suite +SOURCEPATH ../Src +SOURCE ut_phonenoteutil_DllMain.cpp + +//SOURCEPATH ../../../../../phoneengine/engineinfo/src +//SOURCE cpeengineinfo.cpp + +// Code under test +SOURCEPATH ../../../src +SOURCE phonenoteutil.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_cphonestate.cpp +SOURCE mock_cphonestatemachine.cpp +SOURCE mock_cphonestatehandle.cpp +SOURCE mock_cphoneaccessorybthandler.cpp + +SOURCEPATH ../../../../internal/mocks/ +SOURCE mock_cphonebtaadisconnecthandler.cpp + +SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol +SOURCE mock_cphonenumberentrymanager.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuistates +SOURCE mock_cphonestatemachinegsm.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuiview +SOURCE mock_cphoneviewcommandhandle.cpp + +SOURCEPATH ../../../../../internal/mocks/phoneengine/engineinfo +SOURCE mock_cpeengineinfoimpl.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuiutils +SOURCE mock_cphonemainresourceresolver.cpp +SOURCE mock_cphonelogger.cpp +SOURCE mock_cphonepubsubproxy.cpp +SOURCE mock_cphonecenrepproxy.cpp +SOURCE mock_cphonekeys.cpp +SOURCE mock_tphonecmdparamboolean.cpp +SOURCE mock_tphonecmdparaminteger.cpp +SOURCE mock_tphonecommandparam.cpp +SOURCE mock_tphonecmdparamappinfo.cpp +SOURCE mock_cphonemainerrormessageshandler.cpp +SOURCE mock_cphoneclearblacklist.cpp + +SOURCEPATH ../../../../internal/mocks/ +SOURCE mock_featmgr.cpp +SOURCE mock_StringLoader.cpp +SOURCE mock_basched.cpp + +SOURCEPATH ../../../../internal/mocks/phonemediatorcenter +SOURCE mock_cphoneterminateallconnectionscommand.cpp +SOURCE mock_cphonemediatorfactory.cpp +SOURCE mock_cphonemediatorsender.cpp +SOURCE mock_cphonereleasecommand.cpp +SOURCE mock_cphonecontinueemergencycallcommand.cpp + +SOURCEPATH ../../../../../internal/mocks/eikmenupane +SOURCE mock_eikmenup.cpp +SOURCE mock_eikmenub.cpp +SOURCE mock_coecntrl.cpp +SOURCE mock_eikbctrl.cpp +SOURCE mock_coemop.cpp +SOURCE mock_coeinput.cpp +SOURCE mock_gulbordr.cpp +SOURCE mock_akncontrol.cpp +SOURCE mock_eikcmobs.cpp +SOURCE mock_coemain.cpp +SOURCE mock_eikenv.cpp +SOURCE mock_eikvcurs.cpp + +USERINCLUDE ../../../../../phoneengine/engineinfo/inc +USERINCLUDE ../../../../phoneuiview/inc +USERINCLUDE ../../../../phoneuicontrol/inc +USERINCLUDE ../../../../phoneuistates/inc +USERINCLUDE ../../../../phoneuiutils/inc +USERINCLUDE ../../../../phoneui2/srcdata +USERINCLUDE ../../../../phonemediatorcenter/inc +USERINCLUDE ../../../../phoneuiqtviewadapter/inc +USERINCLUDE ../../../../internal/mocks/phoneuiview + +APP_LAYER_SYSTEMINCLUDE +SYSTEMINCLUDE /epoc32/include/platform/mw/graphics/uigraphicsutils/ +SYSTEMINCLUDE ../../../inc // phoneuicontrol inc +SYSTEMINCLUDE /epoc32/include/Digia/EUnit +SYSTEMINCLUDE ../../../../../inc // phone internal headers + +LIBRARY phoneuiutils.lib +LIBRARY EUnit.lib +LIBRARY EUnitUtil.lib +LIBRARY euser.lib +LIBRARY CentralRepository.lib +LIBRARY symbianmock.lib +LIBRARY efsrv.lib +LIBRARY gdi.lib // TZoomFactor +LIBRARY ws32.lib // RWsSession +LIBRARY apgrfx.lib +LIBRARY fbscli.lib +LIBRARY ConnMon.lib // RConnectionMonitor +LIBRARY sendui.lib // CMessageData +LIBRARY charconv.lib +LIBRARY engineinfo.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def --- a/phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def Fri Oct 15 12:58:46 2010 +0300 @@ -14,44 +14,44 @@ ?callsExists@PhoneUIQtViewAdapter@@AAE_NHH@Z @ 13 NONAME ; bool PhoneUIQtViewAdapter::callsExists(int, int) ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXHHAAVTDesC16@@@Z @ 14 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int, int, class TDesC16 &) ?tr@PhoneResourceAdapter@@SA?AVQString@@PBD0H@Z @ 15 NONAME ; class QString PhoneResourceAdapter::tr(char const *, char const *, int) - ?convert@PhoneResourceAdapter@@QAA?AV?$QMap@W4ActionType@PhoneAction@@PAV2@@@HZZ @ 16 NONAME ; class QMap PhoneResourceAdapter::convert(int, ...) - ?convertToHbActions@PhoneResourceAdapter@@QBE?AV?$QList@PAVHbAction@@@@H@Z @ 17 NONAME ; class QList PhoneResourceAdapter::convertToHbActions(int) const - ?handleCipheringInfoChange@PhoneUIQtViewAdapter@@AAEXH@Z @ 18 NONAME ; void PhoneUIQtViewAdapter::handleCipheringInfoChange(int) - ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXHH@Z @ 19 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int, int) - ?noteController@PhoneUIQtViewAdapter@@QBEPAVPhoneNoteController@@XZ @ 20 NONAME ; class PhoneNoteController * PhoneUIQtViewAdapter::noteController(void) const - ??_EPhoneResourceAdapter@@UAE@I@Z @ 21 NONAME ; PhoneResourceAdapter::~PhoneResourceAdapter(unsigned int) - ?tr@PhoneResourceAdapter@@SA?AVQString@@PBD0@Z @ 22 NONAME ; class QString PhoneResourceAdapter::tr(char const *, char const *) - ?trUtf8@PhoneResourceAdapter@@SA?AVQString@@PBD0@Z @ 23 NONAME ; class QString PhoneResourceAdapter::trUtf8(char const *, char const *) - ?getStaticMetaObject@PhoneResourceAdapter@@SAABUQMetaObject@@XZ @ 24 NONAME ; struct QMetaObject const & PhoneResourceAdapter::getStaticMetaObject(void) - ?getDialpadStringLength@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 25 NONAME ; void PhoneUIQtViewAdapter::getDialpadStringLength(class TPhoneCommandParam *) - ?trUtf8@PhoneResourceAdapter@@SA?AVQString@@PBD0H@Z @ 26 NONAME ; class QString PhoneResourceAdapter::trUtf8(char const *, char const *, int) - ?convertCommandToString@PhoneResourceAdapter@@QBE?AVQString@@H@Z @ 27 NONAME ; class QString PhoneResourceAdapter::convertCommandToString(int) const - ?activeCallCount@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 28 NONAME ; void PhoneUIQtViewAdapter::activeCallCount(class TPhoneCommandParam *) - ?setTouchButtons@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 29 NONAME ; void PhoneUIQtViewAdapter::setTouchButtons(class TPhoneCommandParam *) - ?setExpandActions@PhoneUIQtViewAdapter@@AAEXXZ @ 30 NONAME ; void PhoneUIQtViewAdapter::setExpandActions(void) - ?qt_metacast@PhoneUIQtViewAdapter@@UAEPAXPBD@Z @ 31 NONAME ; void * PhoneUIQtViewAdapter::qt_metacast(char const *) - ?Instance@PhoneResourceAdapter@@SAPAV1@PAVQObject@@@Z @ 32 NONAME ; class PhoneResourceAdapter * PhoneResourceAdapter::Instance(class QObject *) - ?getNumberFromDialpad@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 33 NONAME ; void PhoneUIQtViewAdapter::getNumberFromDialpad(class TPhoneCommandParam *) - ?openLogs@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 34 NONAME ; void PhoneUIQtViewAdapter::openLogs(class TPhoneCommandParam *) - ?isConference@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 35 NONAME ; void PhoneUIQtViewAdapter::isConference(class TPhoneCommandParam *) - ?convertToString@PhoneResourceAdapter@@QBE?AVQString@@HABV2@@Z @ 36 NONAME ; class QString PhoneResourceAdapter::convertToString(int, class QString const &) const - ?qt_metacast@PhoneResourceAdapter@@UAEPAXPBD@Z @ 37 NONAME ; void * PhoneResourceAdapter::qt_metacast(char const *) - ??0PhoneUIQtViewAdapter@@QAE@AAVPhoneUIQtViewIF@@PAVQObject@@@Z @ 38 NONAME ; PhoneUIQtViewAdapter::PhoneUIQtViewAdapter(class PhoneUIQtViewIF &, class QObject *) - ?ExecuteCommand@PhoneUIQtViewAdapter@@UAEXHPAVTPhoneCommandParam@@@Z @ 39 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommand(int, class TPhoneCommandParam *) - ?onFocusGained@PhoneUIQtViewAdapter@@AAEXXZ @ 40 NONAME ; void PhoneUIQtViewAdapter::onFocusGained(void) - ?keyReleased@PhoneUIQtViewAdapter@@AAEXPAVQKeyEvent@@@Z @ 41 NONAME ; void PhoneUIQtViewAdapter::keyReleased(class QKeyEvent *) - ?setEngineInfo@PhoneUIQtViewAdapter@@QAEXPAVMPEEngineInfo@@@Z @ 42 NONAME ; void PhoneUIQtViewAdapter::setEngineInfo(class MPEEngineInfo *) - ?setCommonButtonFlags@PhoneUIQtViewAdapter@@AAEXXZ @ 43 NONAME ; void PhoneUIQtViewAdapter::setCommonButtonFlags(void) - ?bringToForeground@PhoneUIQtViewAdapter@@AAEXXZ @ 44 NONAME ; void PhoneUIQtViewAdapter::bringToForeground(void) - ??_EPhoneUIQtViewAdapter@@UAE@I@Z @ 45 NONAME ; PhoneUIQtViewAdapter::~PhoneUIQtViewAdapter(unsigned int) - ?buttonsController@PhoneResourceAdapter@@QAEPAVPhoneUIQtButtonsController@@XZ @ 46 NONAME ; class PhoneUIQtButtonsController * PhoneResourceAdapter::buttonsController(void) - ?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 *) + ?convertToHbActions@PhoneResourceAdapter@@QBE?AV?$QList@PAVHbAction@@@@H@Z @ 16 NONAME ; class QList PhoneResourceAdapter::convertToHbActions(int) const + ?handleCipheringInfoChange@PhoneUIQtViewAdapter@@AAEXH@Z @ 17 NONAME ; void PhoneUIQtViewAdapter::handleCipheringInfoChange(int) + ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXHH@Z @ 18 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int, int) + ?noteController@PhoneUIQtViewAdapter@@QBEPAVPhoneNoteController@@XZ @ 19 NONAME ; class PhoneNoteController * PhoneUIQtViewAdapter::noteController(void) const + ??_EPhoneResourceAdapter@@UAE@I@Z @ 20 NONAME ; PhoneResourceAdapter::~PhoneResourceAdapter(unsigned int) + ?tr@PhoneResourceAdapter@@SA?AVQString@@PBD0@Z @ 21 NONAME ; class QString PhoneResourceAdapter::tr(char const *, char const *) + ?trUtf8@PhoneResourceAdapter@@SA?AVQString@@PBD0@Z @ 22 NONAME ; class QString PhoneResourceAdapter::trUtf8(char const *, char const *) + ?getStaticMetaObject@PhoneResourceAdapter@@SAABUQMetaObject@@XZ @ 23 NONAME ; struct QMetaObject const & PhoneResourceAdapter::getStaticMetaObject(void) + ?getDialpadStringLength@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 24 NONAME ; void PhoneUIQtViewAdapter::getDialpadStringLength(class TPhoneCommandParam *) + ?trUtf8@PhoneResourceAdapter@@SA?AVQString@@PBD0H@Z @ 25 NONAME ; class QString PhoneResourceAdapter::trUtf8(char const *, char const *, int) + ?convertCommandToString@PhoneResourceAdapter@@QBE?AVQString@@H@Z @ 26 NONAME ; class QString PhoneResourceAdapter::convertCommandToString(int) const + ?activeCallCount@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 27 NONAME ; void PhoneUIQtViewAdapter::activeCallCount(class TPhoneCommandParam *) + ?setTouchButtons@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 28 NONAME ; void PhoneUIQtViewAdapter::setTouchButtons(class TPhoneCommandParam *) + ?setExpandActions@PhoneUIQtViewAdapter@@AAEXXZ @ 29 NONAME ; void PhoneUIQtViewAdapter::setExpandActions(void) + ?qt_metacast@PhoneUIQtViewAdapter@@UAEPAXPBD@Z @ 30 NONAME ; void * PhoneUIQtViewAdapter::qt_metacast(char const *) + ?Instance@PhoneResourceAdapter@@SAPAV1@PAVQObject@@@Z @ 31 NONAME ; class PhoneResourceAdapter * PhoneResourceAdapter::Instance(class QObject *) + ?getNumberFromDialpad@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 32 NONAME ; void PhoneUIQtViewAdapter::getNumberFromDialpad(class TPhoneCommandParam *) + ?openLogs@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 33 NONAME ; void PhoneUIQtViewAdapter::openLogs(class TPhoneCommandParam *) + ?isConference@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 34 NONAME ; void PhoneUIQtViewAdapter::isConference(class TPhoneCommandParam *) + ?convertToString@PhoneResourceAdapter@@QBE?AVQString@@HABV2@@Z @ 35 NONAME ; class QString PhoneResourceAdapter::convertToString(int, class QString const &) const + ?qt_metacast@PhoneResourceAdapter@@UAEPAXPBD@Z @ 36 NONAME ; void * PhoneResourceAdapter::qt_metacast(char const *) + ??0PhoneUIQtViewAdapter@@QAE@AAVPhoneUIQtViewIF@@PAVQObject@@@Z @ 37 NONAME ; PhoneUIQtViewAdapter::PhoneUIQtViewAdapter(class PhoneUIQtViewIF &, class QObject *) + ?ExecuteCommand@PhoneUIQtViewAdapter@@UAEXHPAVTPhoneCommandParam@@@Z @ 38 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommand(int, class TPhoneCommandParam *) + ?onFocusGained@PhoneUIQtViewAdapter@@AAEXXZ @ 39 NONAME ; void PhoneUIQtViewAdapter::onFocusGained(void) + ?keyReleased@PhoneUIQtViewAdapter@@AAEXPAVQKeyEvent@@@Z @ 40 NONAME ; void PhoneUIQtViewAdapter::keyReleased(class QKeyEvent *) + ?setEngineInfo@PhoneUIQtViewAdapter@@QAEXPAVMPEEngineInfo@@@Z @ 41 NONAME ; void PhoneUIQtViewAdapter::setEngineInfo(class MPEEngineInfo *) + ?setCommonButtonFlags@PhoneUIQtViewAdapter@@AAEXXZ @ 42 NONAME ; void PhoneUIQtViewAdapter::setCommonButtonFlags(void) + ?bringToForeground@PhoneUIQtViewAdapter@@AAEXXZ @ 43 NONAME ; void PhoneUIQtViewAdapter::bringToForeground(void) + ??_EPhoneUIQtViewAdapter@@UAE@I@Z @ 44 NONAME ; PhoneUIQtViewAdapter::~PhoneUIQtViewAdapter(unsigned int) + ?buttonsController@PhoneResourceAdapter@@QAEPAVPhoneUIQtButtonsController@@XZ @ 45 NONAME ; class PhoneUIQtButtonsController * PhoneResourceAdapter::buttonsController(void) + ?convertKey@PhoneUIQtViewAdapter@@AAE_NW4TKeyCode@@AAW4Key@Qt@@@Z @ 46 NONAME ; bool PhoneUIQtViewAdapter::convertKey(enum TKeyCode, enum Qt::Key &) + ?setExpandedConferenceCallHeader@PhoneUIQtViewAdapter@@AAEXXZ @ 47 NONAME ; void PhoneUIQtViewAdapter::setExpandedConferenceCallHeader(void) + ?HandleCommandL@PhoneUIQtViewAdapter@@UAEHHPAVTPhoneCommandParam@@@Z @ 48 NONAME ; int PhoneUIQtViewAdapter::HandleCommandL(int, class TPhoneCommandParam *) + ?convertToToolBarCommandList@PhoneResourceAdapter@@QBE?AV?$QList@VToolBarCommand@XQTelUiCommandExtension@@@@H@Z @ 49 NONAME ; class QList PhoneResourceAdapter::convertToToolBarCommandList(int) const ?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 *) + ?callIdByState@PhoneUIQtViewAdapter@@AAEHPAVTPhoneCommandParam@@@Z @ 52 NONAME ; int PhoneUIQtViewAdapter::callIdByState(class TPhoneCommandParam *) + ?createCallHeader@PhoneUIQtViewAdapter@@AAEXH@Z @ 53 NONAME ; void PhoneUIQtViewAdapter::createCallHeader(int) ?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 *) @@ -73,10 +73,10 @@ ?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 PhoneResourceAdapter::convertToToolBarCommandList(int) const + ?convert@PhoneResourceAdapter@@QAA?AVQString@@HZZ @ 75 NONAME ; class QString PhoneResourceAdapter::convert(int, ...) + ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXH@Z @ 76 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int) + ?trUtf8@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0H@Z @ 77 NONAME ; class QString PhoneUIQtViewAdapter::trUtf8(char const *, char const *, int) + ?setMuteIndication@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 78 NONAME ; void PhoneUIQtViewAdapter::setMuteIndication(class TPhoneCommandParam *) ?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) @@ -97,4 +97,5 @@ ?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) + ?playHandsFreeActivatedTone@PhoneUIQtViewAdapter@@AAEXXZ @ 99 NONAME ; void PhoneUIQtViewAdapter::playHandsFreeActivatedTone(void) diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def --- a/phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def Fri Oct 15 12:58:46 2010 +0300 @@ -109,4 +109,5 @@ _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEiiR7TDesC16 @ 108 NONAME _ZThn8_N20PhoneUIQtViewAdapterD0Ev @ 109 NONAME _ZThn8_N20PhoneUIQtViewAdapterD1Ev @ 110 NONAME + _ZN20PhoneUIQtViewAdapter26playHandsFreeActivatedToneEv @ 111 NONAME diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/inc/phoneglobalnotes.h --- a/phoneapp/phoneuiqtviewadapter/inc/phoneglobalnotes.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/inc/phoneglobalnotes.h Fri Oct 15 12:58:46 2010 +0300 @@ -22,7 +22,6 @@ #include #include "tphonecmdparamnote.h" #include "tphonecmdparamglobalnote.h" -#include "phoneaction.h" #include #include #include @@ -47,9 +46,11 @@ public: /*! - \fn PhoneGlobalNotes (QObject *parent) + \fn PhoneGlobalNotes (XQSystemToneService &toneservice, + QObject *parent) */ - PhoneGlobalNotes(QObject *parent = 0); + PhoneGlobalNotes(XQSystemToneService &toneservice, + QObject *parent = 0); /*! Destructor diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h --- a/phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h Fri Oct 15 12:58:46 2010 +0300 @@ -21,7 +21,6 @@ #include #include #include "tphonecmdparamnote.h" -#include "phoneaction.h" // FORWARD DECLARATION class TPhoneCommandParam; @@ -34,6 +33,7 @@ class QTimer; class PhoneGlobalNotes; class HbDialog; +class XQSystemToneService; class PhoneNoteController : public QObject { @@ -42,9 +42,11 @@ public: /*! - \fn PhoneNoteController (QObject *parent) + \fn PhoneNoteController (XQSystemToneService& toneservice, + QObject *parent) */ - PhoneNoteController(QObject *parent = 0); + PhoneNoteController(XQSystemToneService& toneservice, + QObject *parent = 0); /*! Destructor diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/inc/phoneresourceadapter.h --- a/phoneapp/phoneuiqtviewadapter/inc/phoneresourceadapter.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/inc/phoneresourceadapter.h Fri Oct 15 12:58:46 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Converts Symbian resources PhoneAction objects. +* Description: Converts Symbian resources QString or HbAction objects. * */ @@ -20,7 +20,7 @@ #include #include -#include "phoneaction.h" +#include #ifdef BUILD_PHONEUIQTVIEWADAPTER #define PHONEURESOURCEADAPTER_EXPORT Q_DECL_EXPORT @@ -60,14 +60,14 @@ PhoneUIQtButtonsController* buttonsController (); /*! - \fn QMap PhoneResourceAdapter::convert (int symbianResourceId) + \fn QString PhoneResourceAdapter::convert (int symbianResourceId) This method converts given Symbian resource id to mapping of translated texts, actions etc. Returns map of actions. */ - QMap convert (int symbianResourceId, ...); + QString convert (int symbianResourceId, ...); /*! \fn QString PhoneResourceAdapter::convert (int symbianResourceId) @@ -115,15 +115,16 @@ QList convertToHbActions(int symbianResourceId) const; /*! - \fn QString PhoneResourceAdapter::convertToToolBarCommandList() + \fn QList + convertToToolBarCommandList() - Converts given Symbian command id to tool bar command list. + Converts given Symbian command id to tool bar extension command list. Returns command list. */ - QList convertToToolBarCommandList( - int symbianResourceId ) const; - + QList + convertToToolBarCommandList( + int symbianResourceId ) const; protected: /*! diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/inc/phoneuicommandcontroller.h --- a/phoneapp/phoneuiqtviewadapter/inc/phoneuicommandcontroller.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/inc/phoneuicommandcontroller.h Fri Oct 15 12:58:46 2010 +0300 @@ -24,7 +24,6 @@ #include #include "phonecommandextensionwrapper.h" #include "phoneuiqtviewif.h" -#include "phoneaction.h" // FORWARD DECLARATION class HbAction; @@ -71,7 +70,7 @@ Returns push button actions for call. */ - QMap pushButtonActionsForCall( + QList pushButtonActionsForCall( int callState, bool emergencyCall, QMap callStates, @@ -85,7 +84,7 @@ Returns tool bar actions for call. */ - QList toolBarActions( + QList toolBarActions( int resourceId, QMap callStates, QMap serviceIds, @@ -116,7 +115,7 @@ Maps ui command extension commands to phone app commands. */ - int mapCommand(int command) const; + int mapCommand(int extensionCommand) const; /*! \fn void commandExtension() @@ -193,27 +192,7 @@ and held calls exists). */ void setMultiCallFlag(QList callStates) const; - - /*! - \fn void mapToExtensionToolBarItems() - - Maps phone action tool bar item list to ui command extension - tool bar item list. - */ - void mapToExtensionToolBarItems( - const QList &sourceList, - QList &toolBarCmdList) const; - - /*! - \fn void mapToPhoneActionToolBarItems() - - Maps ui command extension tool bar item list to phone action - tool bar item list. - */ - void mapToPhoneActionToolBarItems( - const QList &sourceList, - QList &commandList) const; - + /*! \fn void buttonCommandList() @@ -224,12 +203,13 @@ QList callStates) const; /*! - \fn void mapCommandToAction() + \fn HbAction *createAction(int extensionCommand, bool enabled) + + Converts given extension command id to HbAction. - Maps push button command to phone action. - */ - PhoneAction *mapCommandToAction(int command, - bool disabled=false) const; + Returns action. + */ + HbAction *createAction(int extensionCommand, bool enabled = true) const; /*! \fn void emergencyCall() diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h --- a/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h Fri Oct 15 12:58:46 2010 +0300 @@ -28,7 +28,7 @@ #include #include #include "mphoneviewcommandhandle.h" -#include "phoneaction.h" +#include "rphonetoneclient.h" class PhoneUIQtViewIF; class PhoneBubbleWrapper; @@ -45,6 +45,7 @@ class PhoneAppLauncher; class MPEEngineInfo; class PhoneCallHeaderManager; +class XQSystemToneService; class PHONEUIQTVIEWADAPTER_EXPORT PhoneUIQtViewAdapter : public QObject, @@ -530,12 +531,18 @@ */ bool convertKey(TKeyCode symbianKey, Qt::Key &qtKey); + /*! + /fn void playHandsFreeActivatedTone() + This method play handfree activated tone. + */ + void playHandsFreeActivatedTone(); + private: PhoneUIQtViewIF &m_view; int m_idleUid; PhoneBubbleWrapper *m_bubbleWrapper; - CPhoneRingingToneController *m_ringingtonecontroller; + RPhoneToneClient m_toneClient; PhoneResourceAdapter *m_resourceAdapter; PhoneNoteController *m_noteController; TelephonyService *m_telephonyService; @@ -544,13 +551,13 @@ PhoneIndicatorController *m_indicatorController; PhoneCallHeaderManager *m_phoneCallHeaderManager; bool m_dialpadAboutToClose; - bool m_homeScreenToForeground; - PhoneVisibilityHandler *m_visibilityHandler; + PhoneVisibilityHandler *m_visibilityHandler; PhoneAppLauncher *m_appLauncher; bool m_clearDialpadOnClose; bool m_speakerAsDefaultButton; bool m_ringingTonePlaying; - MPEEngineInfo* m_engineInfo; + MPEEngineInfo *m_engineInfo; + XQSystemToneService *m_toneService; }; #endif // PHONEUIQTVIEWADAPTER_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h --- a/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h Fri Oct 15 12:58:46 2010 +0300 @@ -128,6 +128,9 @@ EPhoneViewSetSoftRejectDimmed, EPhoneViewDisableDeviceLock, EPhoneViewIsRingingTonePlaying, + EPhoneViewSetVideoCallOnTop, + EPhoneViewSetRingingFlag, + EPhoneViewPlayHandsFreeActivatedTone, EPhoneAmountOfCommands, // Don't remove this, this should always be the last in list. }; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/inc/phonevisibilityhandler.h --- a/phoneapp/phoneuiqtviewadapter/inc/phonevisibilityhandler.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/inc/phonevisibilityhandler.h Fri Oct 15 12:58:46 2010 +0300 @@ -63,13 +63,17 @@ * Control visiblity */ void bringToForeground(); - void sendToBackground(bool homeScreenForeground); + void bringVideoCallToForeground(); + void sendToBackground(); void hideDeviceDialogs(bool hide); /** - * Return true if phone is visible application + * Return true if some (or all) of the phone window is visible, + * either directly or through a transparent window */ - bool phoneVisible(); + bool phoneVisible() const; + + void windowVisibilityChange(bool isVisible); public: // from MPhonePubSubObserver @@ -133,6 +137,9 @@ /** Key guard status before phone came top */ bool m_keyguardOnBeforeForeground; + + /** Phone visible */ + bool m_phoneVisible; }; #endif // PHONEVISIBILITYHANDLER_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/src/phoneglobalnotes.cpp --- a/phoneapp/phoneuiqtviewadapter/src/phoneglobalnotes.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/src/phoneglobalnotes.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -29,16 +29,17 @@ const TInt KCriticalLevel = 2; -PhoneGlobalNotes::PhoneGlobalNotes(QObject *parent) : - QObject(parent), +PhoneGlobalNotes::PhoneGlobalNotes(XQSystemToneService& toneservice, + QObject *parent) : + QObject(parent), m_timer(0), - m_toneService(0), + m_toneService(&toneservice), m_queryCanceledCommand(-1), m_timeoutCommand(-1), iProgressDialog(0) + { PHONE_TRACE - m_toneService = new XQSystemToneService(this); m_timer = new QTimer(this); m_timer->setSingleShot(true); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp --- a/phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -109,7 +109,7 @@ { PHONE_TRACE m_cli = hbTrId("txt_phone_dblist_ongoing_call"); - m_callImage = "qtg_mono_call"; + m_callImage = "qtg_large_active_call"; } void PhoneIndicatorController::clearActiveCallData() @@ -214,7 +214,19 @@ QVariant( HbIndicatorInterface::SecondaryTextRole ).toString(), lastMissedCallFrom ); } - QString iconName = "qtg_mono_missed_call_unseen"; + QString iconName; + switch(event->eventType()){ + case LogsEvent::TypeVoiceCall: + iconName = "qtg_large_missed_voice_call_unseen"; + break; + case LogsEvent::TypeVoIPCall: + iconName = "qtg_large_missed_voip_call_unseen"; + break; + case LogsEvent::TypeVideoCall: + iconName = "qtg_large_missed_video_call_unseen"; + break; + } + parameters.insert( QVariant( HbIndicatorInterface::DecorationNameRole ).toString(), iconName ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp --- a/phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -27,8 +27,10 @@ #include #include #include +#include -PhoneNoteController::PhoneNoteController(QObject *parent) : +PhoneNoteController::PhoneNoteController(XQSystemToneService& toneservice, + QObject *parent ) : QObject(parent), m_dtmfNote(0), m_queryNote(0) @@ -36,7 +38,7 @@ PHONE_TRACE m_signalMapper = new QSignalMapper(this); connect(m_signalMapper, SIGNAL(mapped(int)), this, SIGNAL(command (int))); - m_globalNotes = new PhoneGlobalNotes(this); + m_globalNotes = new PhoneGlobalNotes(toneservice, this); connect(m_globalNotes, SIGNAL(command(int)), this, SIGNAL(command(int))); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp --- a/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Converts Symbian resources to PhoneAction objects. +* Description: Converts Symbian resources to QString or HbAction objects. */ #include "phoneresourceadapter.h" @@ -61,143 +61,109 @@ return retValue; } -QMap PhoneResourceAdapter::convert (int symbianResourceId, ...) +QString PhoneResourceAdapter::convert (int symbianResourceId, ...) { - QMap translatedActions; - + QString ret = ""; switch (symbianResourceId) { - case R_PHONEUI_MTCAL_INCOMING_CALL: { - PhoneAction *text = new PhoneAction; - text->setText(hbTrId("txt_phone_other_incoming_call")); - translatedActions[PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_incoming_call"); } break; case R_PHONEUI_VIDEO_CALL_INCOMING: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_incoming_video_call")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_incoming_video_call"); } break; case R_PHONEUI_INCALL_CALL_DISCONNECTED: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_disconnected")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_disconnected"); } break; case R_PHONEUI_INCALL_CALL_HELD: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_on_hold")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_on_hold"); break; } case R_PHONEUI_MULTC_WAITING: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_waiting")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_waiting"); } break; case R_PHONEUI_TIME_DURAT_LONG_WITH_ZERO: { - PhoneAction *text = new PhoneAction; // Symbian modifier used here: %:0%H%:1%T%:2%S%:3 // This is because this text is used by Symbian localization // for formatting later on. - text->setText ("%:0%H%:1%T%:2%S%:3"); - translatedActions [PhoneAction::Text] = text; + ret = ("%:0%H%:1%T%:2%S%:3"); } break; case R_PHONEUI_OUT_GOING_CALL: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_calling")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_calling"); } break; case R_PHONEUI_OUT_GOING_VIDEO_CALL: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_calling_video_call")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_calling_video_call"); } break; case R_PHONEUI_MTCAL_CLI_WITHHELD: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_private_number")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_private_number"); } break; case R_PHONEUI_MTCAL_CLI_UNKNOWN: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_unknown_number")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_unknown_number"); } break; case R_PHONE_MTCAL_CLI_PAYPHONE: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("Payphone number")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("Payphone number"); } break; case R_PHONEUI_EMERGENCY_CALL_HEADER: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_emergency_call")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_emergency_call"); } break; case R_PHONEUI_ATTEMPTING_EMERGENCY_CALL_TEXT: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_attempting")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_attempting"); } break; case R_PHONEUI_CONFERENCE_CALL: { - PhoneAction *text = new PhoneAction; - text->setText (hbTrId("txt_phone_other_conference_call")); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_other_conference_call"); } break; case R_PHONEUI_SENDING_DTMF_WAIT_NOTE_TEXT: { - PhoneAction *text = new PhoneAction; VA_LIST list; VA_START (list, symbianResourceId); const TDesC *string = (TDesC*)VA_ARG(list, TDesC*); - text->setText (hbTrId("txt_phone_info_sending").arg(QString::fromUtf16(string->Ptr(), - string->Length()))); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_info_sending").arg(QString::fromUtf16(string->Ptr(), + string->Length())); VA_END (list); } break; case R_PHONEUI_DTMF_WAIT_CHARACTER_CONFIRMATION_QUERY_TEXT: { - PhoneAction *text = new PhoneAction; VA_LIST list; VA_START (list, symbianResourceId); const TDesC *string = (TDesC*)VA_ARG(list, TDesC*); - text->setText (hbTrId("txt_phone_info_send_string").arg(QString::fromUtf16(string->Ptr(), - string->Length()))); - translatedActions [PhoneAction::Text] = text; + ret = hbTrId("txt_phone_info_send_string").arg(QString::fromUtf16(string->Ptr(), + string->Length())); VA_END (list); } break; @@ -205,7 +171,7 @@ break; } - return translatedActions; + return ret; } QString PhoneResourceAdapter::convertToString( @@ -514,10 +480,12 @@ return ret; } -QList PhoneResourceAdapter::convertToToolBarCommandList( + +QList + PhoneResourceAdapter::convertToToolBarCommandList( int symbianResourceId ) const { - QList ret; + QList ret; switch(symbianResourceId) { case R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA: @@ -525,9 +493,10 @@ bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::DisableSoftReject)); - ret.append(PhoneAction::ToolBarItem( - PhoneCallComingCmdSoftReject,showSoftReject)); - ret.append(PhoneAction::ToolBarItem(PhoneCallComingCmdSilent,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneCallComingCmdSoftReject,showSoftReject)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneCallComingCmdSilent,true)); } break; @@ -536,9 +505,10 @@ bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::DisableSoftReject)); - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneCallComingCmdSoftReject,showSoftReject)); - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdReject,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdReject,true)); } break; @@ -547,9 +517,9 @@ bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::DisableSoftReject)); - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneCallComingCmdSoftReject,showSoftReject)); - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneCallComingCmdSilent,false)); } break; @@ -559,9 +529,9 @@ bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::DisableSoftReject)); - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneCallComingCmdSoftReject,showSoftReject)); - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdJoinToConference,false)); } break; @@ -577,10 +547,10 @@ PhoneUIQtButtonsController::IhfAsPushButton)) { if (m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::Mute)) { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdUnmute,true)); } else { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdMute,true)); } } else { @@ -588,19 +558,19 @@ PhoneUIQtButtonsController::BluetoothAvailable)) { if (m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::Btaa)) { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdHandset,true)); } else { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdBtHandsfree,true)); } } else { if (!m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::Ihf)) { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdActivateIhf,true)); } else { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdDeactivateIhf,true)); } } @@ -612,14 +582,14 @@ PhoneUIQtButtonsController::Outgoing)); if (m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::Hold)) { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdUnhold,!outgoing)); } else { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdHold,!outgoing)); } - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdOpenContacts,true)); } else { bool outgoing(m_buttonsCtrl->getButtonFlags( @@ -628,20 +598,21 @@ m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::DisableJoin)); - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdSwap,!outgoing)); if (m_buttonsCtrl->getButtonFlags( PhoneUIQtButtonsController::Conference)) { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdJoinToConference,!disableJoin)); } else { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdCreateConference,!disableJoin)); } } - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenDialer,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdOpenDialer,true)); } break; @@ -650,42 +621,50 @@ if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Ihf)) { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdActivateIhf,true)); } else { - ret.append(PhoneAction::ToolBarItem( + ret.append(XQTelUiCommandExtension::ToolBarCommand( PhoneInCallCmdDeactivateIhf,true)); } } - - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenDialer,true)); + + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdOpenDialer,true)); break; /*case R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA: { - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenDialer,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdOpenDialer,true)); if (m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Hold)) { - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdUnhold,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdUnhold,true)); } else { - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdHold,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdHold,true)); } if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Hold)) { - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdMute,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdMute,true)); } else { - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdUnmute,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdUnmute,true)); } - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdDeactivateIhf,true)); - ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenContacts,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdDeactivateIhf,true)); + ret.append(XQTelUiCommandExtension::ToolBarCommand( + PhoneInCallCmdOpenContacts,true)); } break;*/ default: @@ -695,4 +674,3 @@ return ret; } - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp --- a/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -79,13 +79,11 @@ { PHONE_DEBUG("PhoneMenuController::setDialpadMenuActions"); releaseMenu(); - QList values; + QList values; m_view.setMenuActions(values); - qDeleteAll(values); } -QMap - PhoneUiCommandController::pushButtonActionsForCall( +QList PhoneUiCommandController::pushButtonActionsForCall( int callState, bool emergencyCall, QMap callStates, @@ -94,7 +92,7 @@ int callId) { PHONE_TRACE - QMap translatedActions; + QList translatedActions; QList commands = buttonCommandList( callState, emergencyCall, callStates.values()); @@ -110,25 +108,25 @@ } if (1 == commands.count()) { - PhoneAction *action = mapCommandToAction(commands.at(0)); + HbAction *action = createAction(commands.at(0)); if (action) { - translatedActions[PhoneAction::LeftButton] = action; + translatedActions.append(action); } } else if (1 < commands.count()){ - PhoneAction *action = mapCommandToAction(commands.at(0)); - PhoneAction *action2 = mapCommandToAction(commands.at(1)); + HbAction *action = createAction(commands.at(0)); + HbAction *action2 = createAction(commands.at(1)); if (action) { - translatedActions[PhoneAction::LeftButton] = action; + translatedActions.append(action); } if (action2) { - translatedActions[PhoneAction::RightButton] = action2; + translatedActions.append(action2); } } return translatedActions; } -QList PhoneUiCommandController::toolBarActions( +QList PhoneUiCommandController::toolBarActions( int resourceId, QMap callStates, QMap serviceIds, @@ -136,7 +134,6 @@ int callId) { PHONE_TRACE - QList actions; //Set tool bar button flags setJoinFlag(callStates, serviceIds); @@ -146,8 +143,8 @@ setOutgoingFlag(callStates.values()); //Get tool bar item list by resource id. - QList commands = PhoneResourceAdapter::Instance()-> - convertToToolBarCommandList(resourceId); + QList toolBarCmdList = + PhoneResourceAdapter::Instance()->convertToToolBarCommandList(resourceId); if (serviceId != -1) { PhoneCommandExtensionWrapper *extension = commandExtension(serviceId); @@ -156,20 +153,18 @@ QList callInfo; extension->getCallInfoList( callInfo,callStates,serviceIds,callId); - - QList toolBarCmdList; - - mapToExtensionToolBarItems(commands,toolBarCmdList); + //Modify tool bar command list by extension extension->modifyToolBarCommandList(callInfo,toolBarCmdList); - // Map tool bar item list back to the phone action tool bar item list. - mapToPhoneActionToolBarItems(toolBarCmdList,commands); + } } - for ( int i=0; i < commands.count(); ++i) { - PhoneAction *action = mapCommandToAction( - commands.at(i).mCommandId, !commands.at(i).mEnabled); + QList actions; + for ( int i=0; i < toolBarCmdList.count(); ++i) { + HbAction *action = createAction( + toolBarCmdList[i].mCommandId, + toolBarCmdList[i].mIsEnabled); if (action) { actions.append(action); } @@ -230,30 +225,29 @@ void PhoneUiCommandController::addMenuItems(QList menuCmdList) { - QList values; + QList values; for (int i=0;isetCommand(command); - phoneAction->setText( + QScopedPointer action(new HbAction()); + action->setProperty("command", command); + action->setText( PhoneResourceAdapter::Instance()-> convertCommandToString(command)); - values.append(phoneAction); + values.append(action.take()); } } m_view.setMenuActions(values); - qDeleteAll(values); } -int PhoneUiCommandController::mapCommand(int command) const +int PhoneUiCommandController::mapCommand(int extensionCommand) const { int ret(-1); - switch(command) { + switch(extensionCommand) { case PhoneInCallCmdEndAllCalls: ret = EPhoneInCallCmdEndAllCalls; break; @@ -429,34 +423,6 @@ setButtonFlags(PhoneUIQtButtonsController::MultiCall, multicall); } -void PhoneUiCommandController::mapToExtensionToolBarItems( - const QList &sourceList, - QList &toolBarCmdList) const -{ - toolBarCmdList.clear(); - - for (int i=0;i &sourceList, - QList &commandList) const -{ - commandList.clear(); - - for (int i=0;i PhoneUiCommandController::buttonCommandList( int callState, bool emergencyCall, @@ -564,171 +530,136 @@ return ret; } -PhoneAction *PhoneUiCommandController::mapCommandToAction( - int command, bool disabled) const + + +HbAction *PhoneUiCommandController::createAction( + int extensionCommand, bool enabled) const { - PhoneAction *action=0; + QScopedPointer action(new HbAction); + action->setEnabled(enabled); - switch( command ) { + switch (extensionCommand) { case PhoneInCallCmdJoinToConference: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_join_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdJoin); + action->setProperty("command", EPhoneInCallCmdJoin); } break; case PhoneInCallCmdCreateConference: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_join_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdCreateConference); + action->setProperty("command", EPhoneInCallCmdCreateConference); } break; case PhoneInCallCmdAnswer: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_call")); - action->setDisabled(disabled); - action->setCommand (EPhoneCallComingCmdAnswer); - action->setActionRole(PhoneAction::Accept); + action->setProperty("command", EPhoneCallComingCmdAnswer); + action->setSoftKeyRole(QAction::PositiveSoftKey); } break; case PhoneInCallCmdReject: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_reject_call")); - action->setDisabled(disabled); - action->setCommand (EPhoneCallComingCmdReject); - action->setActionRole(PhoneAction::Decline); + action->setProperty("command", EPhoneCallComingCmdReject); + action->setSoftKeyRole(QAction::NegativeSoftKey); } break; case PhoneInCallCmdHold: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_hold_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdHold); + action->setProperty("command", EPhoneInCallCmdHold); } break; case PhoneInCallCmdUnhold: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdUnhold); + action->setProperty("command", EPhoneInCallCmdUnhold); } break; case PhoneInCallCmdEndActive: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_end_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdEndThisActiveCall); - action->setActionRole(PhoneAction::Decline); + action->setProperty("command", EPhoneInCallCmdEndThisActiveCall); + action->setSoftKeyRole(QAction::NegativeSoftKey); } break; case PhoneInCallCmdEndOutgoingCall: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_end_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdEndThisOutgoingCall); - action->setActionRole(PhoneAction::Decline); + action->setProperty("command", EPhoneInCallCmdEndThisOutgoingCall); + action->setSoftKeyRole(QAction::NegativeSoftKey); } break; case PhoneInCallCmdReplace: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_replace_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdReplace); - action->setActionRole(PhoneAction::Accept); + action->setProperty("command", EPhoneInCallCmdReplace); + action->setSoftKeyRole(QAction::PositiveSoftKey); } break; case PhoneInCallCmdSwap: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_swap_call")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdSwap); + action->setProperty("command", EPhoneInCallCmdSwap); } break; case PhoneCallComingCmdSoftReject: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_send")); - action->setDisabled(disabled); - action->setCommand(EPhoneCallComingCmdSoftReject); + action->setProperty("command", EPhoneCallComingCmdSoftReject); } break; case PhoneCallComingCmdSilent: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_speaker_off")); - action->setDisabled(disabled); - action->setCommand(EPhoneCallComingCmdSilent); + action->setProperty("command", EPhoneCallComingCmdSilent); } break; case PhoneInCallCmdOpenDialer: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_dialer")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdDialer); + action->setProperty("command", EPhoneInCallCmdDialer); } break; case PhoneInCallCmdMute: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_mic_mute")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdMute); + action->setProperty("command", EPhoneInCallCmdMute); } break; case PhoneInCallCmdUnmute: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_mic_unmute")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdUnmute); + action->setProperty("command", EPhoneInCallCmdUnmute); } break; case PhoneInCallCmdActivateIhf: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_speaker")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdActivateIhf); + action->setProperty("command", EPhoneInCallCmdActivateIhf); } break; case PhoneInCallCmdDeactivateIhf: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_mobile")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdDeactivateIhf); + action->setProperty("command", EPhoneInCallCmdDeactivateIhf); } break; case PhoneInCallCmdOpenContacts: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_contacts")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdContacts); + action->setProperty("command", EPhoneInCallCmdContacts); } break; case PhoneInCallCmdBtHandsfree: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_bluetooth_headset")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdBtHandsfree); + action->setProperty("command", EPhoneInCallCmdBtHandsfree); } break; case PhoneInCallCmdHandset: { - action = new PhoneAction; action->setIcon(HbIcon("qtg_mono_mobile")); - action->setDisabled(disabled); - action->setCommand(EPhoneInCallCmdHandset); + action->setProperty("command", EPhoneInCallCmdHandset); } break; - default: + default: { + delete action.take(); + } break; } - return action; + return action.take(); } bool PhoneUiCommandController::emergencyCall(QMap callStates) const diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp --- a/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -15,6 +15,7 @@ * */ +#include "cphonemediatorsender.h" #include "phoneuiqtviewadapter.h" #include "phoneuiqtviewif.h" #include "phonebubblewrapper.h" @@ -29,7 +30,7 @@ #include "tphonecmdparamkeycapture.h" #include "cphonepubsubproxy.h" #include "pevirtualengine.h" -#include "cphoneringingtonecontroller.h" +#include "rphonetoneclient.h" #include "phoneresourceadapter.h" #include "phoneui.hrh" #include "cphonemediatorfactory.h" @@ -60,6 +61,7 @@ #include #include #include +#include //CONSTANTS @@ -80,7 +82,6 @@ QObject (parent), m_view (view), m_bubbleWrapper(0), - m_ringingtonecontroller(0), m_resourceAdapter(0), m_noteController(0), m_telephonyService(0), @@ -89,19 +90,20 @@ m_indicatorController(0), m_phoneCallHeaderManager(0), m_dialpadAboutToClose(false), - m_homeScreenToForeground(false), m_visibilityHandler(0), m_appLauncher(0), m_clearDialpadOnClose(true), m_speakerAsDefaultButton(false), m_ringingTonePlaying(false) { + m_toneService = new XQSystemToneService(this); m_bubbleWrapper = new PhoneBubbleWrapper(m_view.bubbleManager(), this); - m_noteController = new PhoneNoteController(this); + m_noteController = new PhoneNoteController(*m_toneService, this); m_uiCommandController = new PhoneUiCommandController(view, this); - m_phoneCallHeaderManager = new PhoneCallHeaderManager(*m_bubbleWrapper, m_view, this); + m_phoneCallHeaderManager = new PhoneCallHeaderManager(*m_bubbleWrapper, + m_view, this); - TRAPD( error, m_ringingtonecontroller = CPhoneRingingToneController::NewL () ); + int error = m_toneClient.Connect(); qt_symbian_throwIfError(error); m_resourceAdapter = PhoneResourceAdapter::Instance(this); @@ -130,11 +132,12 @@ PhoneUIQtViewAdapter::~PhoneUIQtViewAdapter () { - delete m_ringingtonecontroller; + m_toneClient.Close(); } void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId) { + PHONE_TRACE1(aCmdId) switch (aCmdId) { case EPhoneAppShutDown: { @@ -147,17 +150,17 @@ break; case EPhoneViewMuteRingToneOnAnswer: - m_ringingtonecontroller->MuteRingingToneOnAnswer(); + m_toneClient.StopPlayingL(); break; case EPhoneViewStopRingTone: - m_ringingTonePlaying = false; - m_ringingtonecontroller->StopPlaying(); + m_ringingTonePlaying = false; + m_toneClient.StopPlayingL(); break; case EPhoneViewMuteRingTone: m_ringingTonePlaying = false; - m_ringingtonecontroller->MuteRingingTone(); + m_toneClient.StopPlayingL(); break; case EPhoneViewHideNaviPaneAudioVolume: @@ -174,8 +177,7 @@ case EPhoneViewSendToBackground: case EPhoneViewBringIdleToForeground: - m_visibilityHandler->sendToBackground(m_homeScreenToForeground); - m_homeScreenToForeground = false; + m_visibilityHandler->sendToBackground(); break; case EPhoneViewRemoveAllCallHeaders: removeAllCallHeaders(); @@ -209,14 +211,18 @@ case EPhoneViewUpdateFSW: setHidden(true); break; + case EPhoneViewPlayHandsFreeActivatedTone: + playHandsFreeActivatedTone(); + break; default: break; } - CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId ); + CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId ); } void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId) { + PHONE_TRACE1(aCmdId) switch (aCmdId) { case EPhoneViewRemoveCallHeader: { @@ -257,10 +263,11 @@ void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TPhoneCommandParam* aCommandParam) { + PHONE_TRACE1(aCmdId) switch (aCmdId) { case EPhoneViewPlayRingTone: m_ringingTonePlaying = true; - m_ringingtonecontroller->PlayRingToneL( aCommandParam ); + m_toneClient.PlayRingingToneL( aCommandParam ); break; case EPhoneViewSetNaviPaneAudioVolume: setAudioVolumeSliderValue (aCommandParam); @@ -314,6 +321,7 @@ void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId, TPhoneCommandParam *aCommandParam) { + PHONE_TRACE1(aCmdId) switch (aCmdId) { case EPhoneViewGetCallExistsInConference: conferenceCallId(aCallId, aCommandParam); @@ -340,6 +348,7 @@ void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId, TDesC &aMessage) { + PHONE_TRACE1(aCmdId) switch (aCmdId) { default: @@ -350,6 +359,7 @@ TPhoneViewResponseId PhoneUIQtViewAdapter::HandleCommandL (TPhoneViewCommandId aCmdId) { + PHONE_TRACE1(aCmdId) TPhoneViewResponseId response = EPhoneViewResponseSuccess; switch (aCmdId) { @@ -376,12 +386,10 @@ TPhoneViewResponseId PhoneUIQtViewAdapter::HandleCommandL (TPhoneViewCommandId aCmdId, TPhoneCommandParam *aCommandParam) { + PHONE_TRACE1(aCmdId) TPhoneViewResponseId viewResponse = EPhoneViewResponseSuccess; switch (aCmdId) { - case EPhoneViewGetCallIdByState: - viewResponse = callIdByState (aCommandParam); - break; case EPhoneViewSelectedConfMember: viewResponse = getSelectedConferenceMember (aCommandParam); break; @@ -394,6 +402,7 @@ void PhoneUIQtViewAdapter::ExecuteCommand (TPhoneViewCommandId aCmdId) { + PHONE_TRACE1(aCmdId) switch (aCmdId) { case EPhoneSetConferenceExpanded: m_bubbleWrapper->bubbleManager ().startChanges (); @@ -410,6 +419,9 @@ case EPhoneViewOpenContacts: openContacts(); break; + case EPhoneViewSetVideoCallOnTop: + m_visibilityHandler->bringVideoCallToForeground(); + break; default: break; } @@ -417,6 +429,7 @@ void PhoneUIQtViewAdapter::ExecuteCommand (TPhoneViewCommandId aCmdId, TPhoneCommandParam *aCommandParam) { + PHONE_TRACE1(aCmdId) switch (aCmdId) { case EPhoneViewGetAudioVolumeLevel: writeAudioVolumeLevel (aCommandParam); @@ -430,8 +443,7 @@ } break; case EPhoneViewHsToForegroundAfterCall: { - TPhoneCmdParamBoolean *param = static_cast(aCommandParam); - m_homeScreenToForeground = param->Boolean(); + //TODO: remove EPhoneViewHsToForegroundAfterCall } break; case EPhoneViewSetIhfFlag: { @@ -466,6 +478,11 @@ param->Boolean()); } break; + case EPhoneViewSetRingingFlag: { + TPhoneCmdParamBoolean *param = static_cast(aCommandParam); + m_ringingTonePlaying = param->Boolean(); + } + break; case EPhoneViewStartCapturingKey: { TPhoneCmdParamKeyCapture *captureParam = static_cast(aCommandParam); @@ -509,6 +526,9 @@ setTouchButtons (aCommandParam); setExpandActions(); break; + case EPhoneViewGetCallIdByState: + callIdByState(aCommandParam); + break; default: break; } @@ -560,11 +580,13 @@ void PhoneUIQtViewAdapter::onFocusLost() { + m_visibilityHandler->windowVisibilityChange(false); m_indicatorController->enableActiveCallIndicator(); } void PhoneUIQtViewAdapter::onFocusGained() { + m_visibilityHandler->windowVisibilityChange(true); m_indicatorController->disableActiveCallIndicator(); } @@ -580,7 +602,6 @@ if( m_phoneCallHeaderManager->isVoiceCall(callId) ){ m_indicatorController->setActiveCallData(); } - } void PhoneUIQtViewAdapter::createEmergencyCallHeader(int callId) @@ -639,7 +660,7 @@ m_view.clearBubbleCommands(m_bubbleWrapper->bubbles().value(callId)); // Get bubble actions by call type - QMap actions = + QList actions = m_uiCommandController->pushButtonActionsForCall( m_bubbleWrapper->callStates().value(callId), emergencyCall, @@ -648,13 +669,11 @@ m_bubbleWrapper->serviceIdByCallId(callId), callId); - QList values = actions.values(); - for (int i = 0; i < values.size (); ++i) { - PhoneAction *action = values.at (i); - m_view.addBubbleCommand(m_bubbleWrapper->bubbles().value(callId), - *action); - delete action; + foreach (HbAction *action, actions) { + m_view.addBubbleCommand( + m_bubbleWrapper->bubbles().value(callId), action); } + } setExpandedConferenceCallHeader(); @@ -681,7 +700,7 @@ serviceId = m_bubbleWrapper->serviceIdByCallId(callId); } - QList actions = m_uiCommandController->toolBarActions( + QList actions = m_uiCommandController->toolBarActions( intParam.Integer(), m_bubbleWrapper->callStates(), m_bubbleWrapper->serviceIds(), @@ -692,7 +711,6 @@ m_view.setToolbarActions(actions); } - qDeleteAll(actions); } void PhoneUIQtViewAdapter::writeAudioVolumeLevel (TPhoneCommandParam *commandParam) @@ -932,7 +950,7 @@ if (booleanParam->Boolean()) { m_dialpadAboutToClose = false; m_view.showDialpad(); - } else { + } else if (m_view.isDialpadVisible()) { m_clearDialpadOnClose = false; m_view.hideDialpad(); } @@ -1082,8 +1100,7 @@ bool phoneVisible = m_visibilityHandler->phoneVisible(); - m_homeScreenToForeground = false; - m_visibilityHandler->sendToBackground(m_homeScreenToForeground); + m_visibilityHandler->sendToBackground(); if (phoneVisible) { // Activate logs dialer only if telephone is on the top. @@ -1125,4 +1142,8 @@ return ret; } - +void PhoneUIQtViewAdapter::playHandsFreeActivatedTone() +{ + m_toneService->playTone( + XQSystemToneService::IntegratedHandsFreeActivatedTone); +} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/src/phonevisibilityhandler.cpp --- a/phoneapp/phoneuiqtviewadapter/src/phonevisibilityhandler.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/src/phonevisibilityhandler.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -40,10 +40,11 @@ m_hideDeviceDialogs(false), m_deviceLockEnabled(false), m_carModeSubscriber(0), - m_carModePublisher(0) + m_carModePublisher(0), + m_phoneVisible(false) { - PHONE_TRACE; - sendToBackground(false); // Send phone to background + PHONE_TRACE + sendToBackground(); // Send phone to background m_carModePublisher = new QValueSpacePublisher("/phone",this); m_carModePublisher->setValue(QString("/carmode"),QVariant(false)); @@ -63,7 +64,6 @@ QT_TRAP_THROWING(CPhonePubSubProxy::Instance()->NotifyChangeL( KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, this)); - } @@ -72,7 +72,7 @@ */ PhoneVisibilityHandler::~PhoneVisibilityHandler() { - PHONE_TRACE; + PHONE_TRACE CPhonePubSubProxy::Instance()->CancelAllNotifications(this); } @@ -81,21 +81,33 @@ */ void PhoneVisibilityHandler::bringToForeground() { - PHONE_TRACE2("m_carModeEnabled=", m_carModeEnabled); + PHONE_TRACE2("m_carModeEnabled=", m_carModeEnabled) if (!m_carModeEnabled) { disableKeyGuard(); - m_view.bringToForeground(); - adjustVisibility(BringForwards); + adjustVisibility(BringForwards); // change coe priority + m_view.bringToForeground(); // change z-order } } /*! + PhoneVisibilityHandler::bringVideoCallToForeground. + */ +void PhoneVisibilityHandler::bringVideoCallToForeground() +{ + PHONE_TRACE + TApaTaskList taskList(m_eikonEnv->WsSession()); + const TUid KVideoTelUid = TUid::Uid(0x101F8681); + TApaTask task = taskList.FindApp(KVideoTelUid); + task.BringToForeground(); +} + +/*! PhoneVisibilityHandler::hideDeviceDialogs. */ void PhoneVisibilityHandler::hideDeviceDialogs(bool hide) { - PHONE_TRACE2(": hide =", hide); + PHONE_TRACE2(": hide =", hide) m_hideDeviceDialogs = hide; adjustVisibility(KeepCurrentPos); } @@ -103,39 +115,36 @@ /*! PhoneVisibilityHandler::phoneVisible. */ -bool PhoneVisibilityHandler::phoneVisible() +bool PhoneVisibilityHandler::phoneVisible() const { PHONE_TRACE - // Should we check if there is phone's devicedialogs visible? - return (m_eikonEnv->RootWin().OrdinalPosition() == 0); + return m_phoneVisible; +} + +/*! + PhoneVisibilityHandler::windowVisibilityChange + */ +void PhoneVisibilityHandler::windowVisibilityChange(bool visible) +{ + PHONE_TRACE2(": visible =", visible) + m_phoneVisible = visible; } /*! PhoneVisibilityHandler::sendToBackground. */ -void PhoneVisibilityHandler::sendToBackground(bool homeScreenForeground) +void PhoneVisibilityHandler::sendToBackground() { - PHONE_TRACE4(": homeScreenForeground =", homeScreenForeground, - ", m_carModeEnabled =", m_carModeEnabled); + PHONE_TRACE2(":m_carModeEnabled =", m_carModeEnabled) if(m_carModeEnabled) { // Don't bring homescreen to foreground return; } - enableKeyGuard(); - - bool setHsToForeground = homeScreenForeground && phoneVisible(); // Send phone back on WSERV stack - adjustVisibility(SendToBack); - - // Fetch homescreen to foreground if needed - if (setHsToForeground) { - _LIT(KPhoneHsAppName,"hsapplication"); - TApaTaskList taskList(m_eikonEnv->WsSession()); - TApaTask task = taskList.FindApp(KPhoneHsAppName); - task.BringToForeground(); - } + m_view.hide(); // change z-order + adjustVisibility(SendToBack); // change coe priority } /*! @@ -151,7 +160,6 @@ PHONE_TRACE2(": m_deviceLockEnabled=", m_deviceLockEnabled); m_view.setRestrictedMode(m_deviceLockEnabled); adjustVisibility(KeepCurrentPos); - } } @@ -205,7 +213,6 @@ amountOfCalls = callInfos->GetCallsL().Count(); CleanupStack::PopAndDestroy(callInfos); ); - return amountOfCalls; } @@ -223,36 +230,33 @@ void PhoneVisibilityHandler::adjustVisibility(AdjustAction action) { PHONE_TRACE + int ordinalPos = m_eikonEnv->RootWin().OrdinalPosition(); if (m_carModeEnabled || (action == SendToBack)) { - PHONE_TRACE1(": SendPhoneToBackground"); + PHONE_TRACE1(": SendPhoneToBackground") m_eikonEnv->RootWin().SetOrdinalPosition(-1, ECoeWinPriorityNeverAtFront); - } else if ((KeepCurrentPos == action) && (m_eikonEnv->RootWin().OrdinalPriority() == ECoeWinPriorityNeverAtFront)) { // Skip situations where phone is put to back // and action is not to bring it up // Execution must come here if there is no calls - PHONE_TRACE1(": Skip"); + PHONE_TRACE1(": Skip") } else if (m_hideDeviceDialogs) { - PHONE_TRACE1(": Hide dialogs"); + PHONE_TRACE1(": Hide dialogs") m_eikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront + 100); } else if (m_deviceLockEnabled) { // critical notes are allowed to show on top of Phone application - PHONE_TRACE1(": Devicelock"); + PHONE_TRACE1(": Devicelock") m_eikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront + 1); } else if (BringForwards == action) { // Try to show phone with normal priority - PHONE_TRACE1(": Bring forward"); - m_eikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityNormal); - + PHONE_TRACE1(": Bring forward") + m_eikonEnv->RootWin().SetOrdinalPosition(ordinalPos, ECoeWinPriorityNormal); } else { // Normalize visiblity after ie. device lock - PHONE_TRACE1(": Normalize"); - int ordinalPos = m_eikonEnv->RootWin().OrdinalPosition(); - + PHONE_TRACE1(": Normalize") m_eikonEnv->RootWin().SetOrdinalPosition(ordinalPos, ECoeWinPriorityNormal); // Flush is needed here, because otherwise launching an application may fail // if done same time with normalization. @@ -262,14 +266,12 @@ void PhoneVisibilityHandler::carModeChanged() { - PHONE_TRACE; + PHONE_TRACE m_carModeEnabled = m_carModeSubscriber->value().toBool(); if(!m_carModeEnabled && (ongoingCalls() > 0)) { bringToForeground(); } - // Adjust visibility according mode (TODO!) - PHONE_TRACE2(": m_carModeEnabled=", m_carModeEnabled); - //adjustVisibility(KeepCurrentPos); + PHONE_TRACE2(": m_carModeEnabled=", m_carModeEnabled) } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/phoneuiqtviewif_stub.h --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/phoneuiqtviewif_stub.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/phoneuiqtviewif_stub.h Fri Oct 15 12:58:46 2010 +0300 @@ -26,7 +26,6 @@ class HbIcon; class HbAction; class HbMenu; -class PhoneAction; class PhoneUIQtViewIFStub : public PhoneUIQtViewIF { @@ -52,7 +51,7 @@ */ void addBubbleCommand ( int bubbleId, - const PhoneAction& action ) {}; + HbAction* action ) {}; /*! \fn void PhoneUIQtViewIF::clearBubbleCommands () @@ -83,7 +82,7 @@ Sets toolbar actions. */ - void setToolbarActions(const QList& actions) {}; + void setToolbarActions(const QList &actions) {}; /*! \fn void PhoneUIQtViewIF::hideToolbar () @@ -188,12 +187,14 @@ */ void bringToForeground() {}; + void hide() {}; + /*! \fn void PhoneUIQtViewIF::setToolbarActions() Sets menu actions. */ - void setMenuActions(const QList& actions) {}; + void setMenuActions(const QList &actions) {}; /*! \fn void PhoneUIQtView::shutdownPhoneApp() diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/ut_phonecallheadermanager.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/ut_phonecallheadermanager.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/ut_phonecallheadermanager.pro Fri Oct 15 12:58:46 2010 +0300 @@ -54,3 +54,5 @@ SOURCES += unit_tests.cpp include(../../../../tsrc/common/phonetest.pri) + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheaderutil/ut_phonecallheaderutil.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheaderutil/ut_phonecallheaderutil.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheaderutil/ut_phonecallheaderutil.pro Fri Oct 15 12:58:46 2010 +0300 @@ -43,3 +43,5 @@ include(../../../../tsrc/common/phonetest.pri) + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/logsevent.h --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/logsevent.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/logsevent.h Fri Oct 15 12:58:46 2010 +0300 @@ -26,6 +26,14 @@ Q_OBJECT public: + +enum LogsEventType + { + TypeUndefined = -1, + TypeVoiceCall, + TypeVideoCall, + TypeVoIPCall + }; LogsEvent(); virtual ~LogsEvent(); @@ -34,6 +42,7 @@ bool isRemotePartyPrivate()const ; const QString& remoteParty() const; const QString& number() const; + LogsEventType eventType() const; }; #endif /* LOGSEVENT_H_ */ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/logsevent_stub.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/logsevent_stub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/logsevent_stub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -42,3 +42,8 @@ { return QString(); } + +LogsEvent::LogsEventType LogsEvent::eventType() const +{ + return LogsEvent::TypeVoiceCall; +} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/phoneuiqtviewif_stub.h --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/phoneuiqtviewif_stub.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/phoneuiqtviewif_stub.h Fri Oct 15 12:58:46 2010 +0300 @@ -26,7 +26,6 @@ class HbIcon; class HbAction; class HbMenu; -class PhoneAction; class BubbleManagerIF; @@ -55,7 +54,7 @@ */ void addBubbleCommand ( int bubbleId, - const PhoneAction& action ) {}; + HbAction* action ) {}; /*! \fn void PhoneUIQtViewIF::clearBubbleCommands () @@ -86,7 +85,7 @@ Sets toolbar actions. */ - void setToolbarActions(const QList& actions) {}; + void setToolbarActions(const QList &actions) {}; /*! \fn void PhoneUIQtViewIF::hideToolbar () @@ -190,13 +189,15 @@ Brings to foreground. */ void bringToForeground(){}; + + void hide() {}; /*! \fn void PhoneUIQtViewIF::setToolbarActions() Sets menu actions. */ - void setMenuActions(const QList& actions) {}; + void setMenuActions(const QList &actions) {}; /*! \fn void PhoneUIQtView::shutdownPhoneApp() diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/ut_phoneindicatorcontroller.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/ut_phoneindicatorcontroller.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/ut_phoneindicatorcontroller.pro Fri Oct 15 12:58:46 2010 +0300 @@ -56,3 +56,5 @@ # MOCKED DEPENDENCIES HEADERS += include(../../../../tsrc/common/phoneuitest.pri) + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/unit_tests.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -19,6 +19,7 @@ #include #include #include +#include //#include #include "phonenotecontroller.h" #include "phoneresourceids.h" @@ -74,7 +75,8 @@ void TestPhoneNoteController::initTestCase () { - m_noteController = new PhoneNoteController(); + XQSystemToneService* toneservice = new XQSystemToneService(this); + m_noteController = new PhoneNoteController(*toneservice); } void TestPhoneNoteController::cleanupTestCase () diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/ut_phonenotecontroller.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/ut_phonenotecontroller.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/ut_phonenotecontroller.pro Fri Oct 15 12:58:46 2010 +0300 @@ -24,9 +24,9 @@ symbian { - INCLUDEPATH += \epoc32\include\platform\mw \ - \epoc32\include\platform \ - \epoc32\include\platform\app \ + INCLUDEPATH += /epoc32/include/platform/mw \ + /epoc32/include/platform \ + /epoc32/include/platform/app \ ../../../phoneuiutils/inc/ \ ../../../phoneuiview2/inc \ ../../../../inc \ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -52,9 +52,6 @@ void testConvertToHbActions(); void testConvertToToolBarCommandList(); void testBtToolBarCommandList(); - -private: - void testIncallToolbar (int id); // helper function private: PhoneResourceAdapter *m_resourceAdapter; // class under test @@ -95,79 +92,52 @@ PhoneUIQtButtonsController* buttonsController = m_resourceAdapter->buttonsController (); - QMap map; - PhoneAction *action = map [PhoneAction::LeftButton]; + QString result = 0; - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_incoming_call") ); - map = m_resourceAdapter->convert(R_PHONEUI_MTCAL_INCOMING_CALL); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert(R_PHONEUI_MTCAL_INCOMING_CALL); + QCOMPARE (result, QString("txt_phone_other_incoming_call")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_disconnected") ); - map = m_resourceAdapter->convert (R_PHONEUI_INCALL_CALL_DISCONNECTED); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_INCALL_CALL_DISCONNECTED); + QCOMPARE(result, QString("txt_phone_other_disconnected")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_on_hold") ); - map = m_resourceAdapter->convert (R_PHONEUI_INCALL_CALL_HELD); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_INCALL_CALL_HELD); + QCOMPARE(result, QString("txt_phone_other_on_hold")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_waiting") ); - map = m_resourceAdapter->convert (R_PHONEUI_MULTC_WAITING); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_MULTC_WAITING); + QCOMPARE(result, QString("txt_phone_other_waiting")); - EXPECT( PhoneAction, setText).with ( QString("%:0%H%:1%T%:2%S%:3") ); - map = m_resourceAdapter->convert (R_PHONEUI_TIME_DURAT_LONG_WITH_ZERO); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_TIME_DURAT_LONG_WITH_ZERO); + QCOMPARE(result, QString("%:0%H%:1%T%:2%S%:3")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_calling") ); - map = m_resourceAdapter->convert (R_PHONEUI_OUT_GOING_CALL); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_OUT_GOING_CALL); + QCOMPARE(result, QString("txt_phone_other_calling")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_private_number") ); - map = m_resourceAdapter->convert (R_PHONEUI_MTCAL_CLI_WITHHELD); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_MTCAL_CLI_WITHHELD); + QCOMPARE(result, QString("txt_phone_other_private_number")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_unknown_number") ); - map = m_resourceAdapter->convert (R_PHONEUI_MTCAL_CLI_UNKNOWN); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_MTCAL_CLI_UNKNOWN); + QCOMPARE(result, QString("txt_phone_other_unknown_number")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_emergency_call") ); - map = m_resourceAdapter->convert (R_PHONEUI_EMERGENCY_CALL_HEADER); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_EMERGENCY_CALL_HEADER); + QCOMPARE(result, QString("txt_phone_other_emergency_call")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_attempting") ); - map = m_resourceAdapter->convert (R_PHONEUI_ATTEMPTING_EMERGENCY_CALL_TEXT); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_ATTEMPTING_EMERGENCY_CALL_TEXT); + QCOMPARE(result, QString("txt_phone_other_attempting")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_other_conference_call") ); - map = m_resourceAdapter->convert (R_PHONEUI_CONFERENCE_CALL); - QVERIFY(verify()); - QCOMPARE (map.size (), 1); + result = m_resourceAdapter->convert (R_PHONEUI_CONFERENCE_CALL); + QCOMPARE(result, QString("txt_phone_other_conference_call")); TBuf<10> buffer(_L("123")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_info_sending") ); - map = m_resourceAdapter->convert (R_PHONEUI_SENDING_DTMF_WAIT_NOTE_TEXT, &buffer); - QVERIFY(verify()); - QCOMPARE (map.size(), 1); + result = m_resourceAdapter->convert (R_PHONEUI_SENDING_DTMF_WAIT_NOTE_TEXT, &buffer); + QCOMPARE(result, QString("txt_phone_info_sending")); - EXPECT( PhoneAction, setText).with ( QString("txt_phone_info_send_string") ); - map = m_resourceAdapter->convert(R_PHONEUI_DTMF_WAIT_CHARACTER_CONFIRMATION_QUERY_TEXT, &buffer); - QVERIFY(verify()); - QCOMPARE(map.size(), 1); + result = m_resourceAdapter->convert(R_PHONEUI_DTMF_WAIT_CHARACTER_CONFIRMATION_QUERY_TEXT, &buffer); + QCOMPARE(result, QString("txt_phone_info_send_string")); // TODO - map = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA); + result = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA); - map = m_resourceAdapter->convert (0); + result = m_resourceAdapter->convert (0); // QCOMPARE (map.size (), 0); } @@ -333,37 +303,6 @@ QCOMPARE( testString2, QString ("") ); } -void TestPhoneResourceAdapter::testIncallToolbar (int id) -{ - QMap map; - PhoneAction *action; - map = m_resourceAdapter->convert (id); - QCOMPARE (map.size (), 4); - - switch(id) { - case R_PHONEUI_CALLHANDLING_INCALL_UNMUTE_CBA: - action = map [PhoneAction::ToolbarButton1]; - QCOMPARE (action->icon (), HbIcon("qtg_mono_dialer")); - action = map [PhoneAction::ToolbarButton2]; - QCOMPARE (action->icon (), HbIcon("qtg_mono_mic_unmute")); - QCOMPARE (action->command (), (int)EPhoneInCallCmdUnmute); - action = map [PhoneAction::ToolbarButton3]; - QCOMPARE (action->icon (), HbIcon("qtg_mono_speaker")); - QCOMPARE (action->command (), (int)EPhoneInCallCmdActivateIhf); - break; - default: - action = map [PhoneAction::ToolbarButton1]; - QCOMPARE (action->icon (), HbIcon("qtg_mono_dialer")); - action = map [PhoneAction::ToolbarButton2]; - QCOMPARE (action->icon (), HbIcon("qtg_mono_mic_mute")); - QCOMPARE (action->command (), (int)EPhoneInCallCmdMute); - action = map [PhoneAction::ToolbarButton3]; - QCOMPARE (action->icon (), HbIcon("qtg_mono_speaker")); - QCOMPARE (action->command (), (int)EPhoneInCallCmdActivateIhf); - break; - } -} - void TestPhoneResourceAdapter::testDefaultToolbarResourceId() { QVERIFY(m_resourceAdapter->defaultToolbarResourceId()== @@ -424,84 +363,84 @@ PhoneUIQtButtonsController* buttonsController = m_resourceAdapter->buttonsController(); - QList testList; + QList testList; testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneCallComingCmdSilent == testList.at(1).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneCallComingCmdSilent == testList[1].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); testList.clear(); // Set soft reject dimmed buttonsController->setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject,true); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneCallComingCmdSilent == testList.at(1).mCommandId); - QVERIFY(false == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneCallComingCmdSilent == testList[1].mCommandId); + QVERIFY(false == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); testList.clear(); // Set soft reject buttonsController->setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject,false); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCOMINGCALL_REJECT_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdReject == testList.at(1).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdReject == testList[1].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); testList.clear(); // Set soft reject dimmed buttonsController->setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject,true); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCOMINGCALL_REJECT_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdReject == testList.at(1).mCommandId); - QVERIFY(false == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdReject == testList[1].mCommandId); + QVERIFY(false == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); testList.clear(); // Set soft reject buttonsController->setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject,false); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCOMINGCALL_SOFT_REJECT_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneCallComingCmdSilent == testList.at(1).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(false == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneCallComingCmdSilent == testList[1].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(false == testList[1].mIsEnabled); testList.clear(); // Set soft reject dimmed buttonsController->setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject,true); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCOMINGCALL_SOFT_REJECT_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneCallComingCmdSilent == testList.at(1).mCommandId); - QVERIFY(false == testList.at(0).mEnabled); - QVERIFY(false == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneCallComingCmdSilent == testList[1].mCommandId); + QVERIFY(false == testList[0].mIsEnabled); + QVERIFY(false == testList[1].mIsEnabled); testList.clear(); // Set soft reject buttonsController->setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject,false); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_CALLWAITING_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdJoinToConference == testList.at(1).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(false == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdJoinToConference == testList[1].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(false == testList[1].mIsEnabled); testList.clear(); // Set soft reject dimmed buttonsController->setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject,true); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_CALLWAITING_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneCallComingCmdSoftReject == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdJoinToConference == testList.at(1).mCommandId); - QVERIFY(false == testList.at(0).mEnabled); - QVERIFY(false == testList.at(1).mEnabled); + QVERIFY(PhoneCallComingCmdSoftReject == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdJoinToConference == testList[1].mCommandId); + QVERIFY(false == testList[0].mIsEnabled); + QVERIFY(false == testList[1].mIsEnabled); testList.clear(); // Set soft reject @@ -509,34 +448,34 @@ testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_EMERGENCY_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneInCallCmdActivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(1).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); + QVERIFY(PhoneInCallCmdActivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[1].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); testList.clear(); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_DIALER_CBA); QCOMPARE(4,testList.count()); - QVERIFY(PhoneInCallCmdActivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdHold == testList.at(1).mCommandId); - QVERIFY(PhoneInCallCmdOpenContacts == testList.at(2).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(3).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); - QVERIFY(true == testList.at(2).mEnabled); - QVERIFY(true == testList.at(3).mEnabled); + QVERIFY(PhoneInCallCmdActivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdHold == testList[1].mCommandId); + QVERIFY(PhoneInCallCmdOpenContacts == testList[2].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[3].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); + QVERIFY(true == testList[2].mIsEnabled); + QVERIFY(true == testList[3].mIsEnabled); testList.clear(); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_CALLSETUP_EMPTY_DTMFDIALER_CBA); QCOMPARE(4,testList.count()); - QVERIFY(PhoneInCallCmdActivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdHold == testList.at(1).mCommandId); - QVERIFY(PhoneInCallCmdOpenContacts == testList.at(2).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(3).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); - QVERIFY(true == testList.at(2).mEnabled); - QVERIFY(true == testList.at(3).mEnabled); + QVERIFY(PhoneInCallCmdActivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdHold == testList[1].mCommandId); + QVERIFY(PhoneInCallCmdOpenContacts == testList[2].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[3].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); + QVERIFY(true == testList[2].mIsEnabled); + QVERIFY(true == testList[3].mIsEnabled); testList.clear(); // Set flags hold and ihf @@ -545,34 +484,34 @@ testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_EMERGENCY_CBA); QCOMPARE(2,testList.count()); - QVERIFY(PhoneInCallCmdDeactivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(1).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); + QVERIFY(PhoneInCallCmdDeactivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[1].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); testList.clear(); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_INCALL_DIALER_CBA); QCOMPARE(4,testList.count()); - QVERIFY(PhoneInCallCmdDeactivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdUnhold == testList.at(1).mCommandId); - QVERIFY(PhoneInCallCmdOpenContacts == testList.at(2).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(3).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); - QVERIFY(true == testList.at(2).mEnabled); - QVERIFY(true == testList.at(3).mEnabled); + QVERIFY(PhoneInCallCmdDeactivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdUnhold == testList[1].mCommandId); + QVERIFY(PhoneInCallCmdOpenContacts == testList[2].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[3].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); + QVERIFY(true == testList[2].mIsEnabled); + QVERIFY(true == testList[3].mIsEnabled); testList.clear(); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_CALLSETUP_EMPTY_DTMFDIALER_CBA); QCOMPARE(4,testList.count()); - QVERIFY(PhoneInCallCmdDeactivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdUnhold == testList.at(1).mCommandId); - QVERIFY(PhoneInCallCmdOpenContacts == testList.at(2).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(3).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); - QVERIFY(true == testList.at(2).mEnabled); - QVERIFY(true == testList.at(3).mEnabled); + QVERIFY(PhoneInCallCmdDeactivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdUnhold == testList[1].mCommandId); + QVERIFY(PhoneInCallCmdOpenContacts == testList[2].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[3].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); + QVERIFY(true == testList[2].mIsEnabled); + QVERIFY(true == testList[3].mIsEnabled); testList.clear(); // Set flag multi call @@ -580,14 +519,14 @@ testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_CALLSETUP_EMPTY_DTMFDIALER_CBA); QCOMPARE(4,testList.count()); - QVERIFY(PhoneInCallCmdDeactivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdSwap == testList.at(1).mCommandId); - QVERIFY(PhoneInCallCmdCreateConference == testList.at(2).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(3).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(true == testList.at(1).mEnabled); - QVERIFY(true == testList.at(2).mEnabled); - QVERIFY(true == testList.at(3).mEnabled); + QVERIFY(PhoneInCallCmdDeactivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdSwap == testList[1].mCommandId); + QVERIFY(PhoneInCallCmdCreateConference == testList[2].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[3].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(true == testList[1].mIsEnabled); + QVERIFY(true == testList[2].mIsEnabled); + QVERIFY(true == testList[3].mIsEnabled); testList.clear(); // Set flag outgoing and conference call @@ -596,26 +535,26 @@ testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCALL_UNMUTE_CBA); QCOMPARE(4,testList.count()); - QVERIFY(PhoneInCallCmdDeactivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdSwap == testList.at(1).mCommandId); - QVERIFY(PhoneInCallCmdJoinToConference == testList.at(2).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(3).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(false == testList.at(1).mEnabled); - QVERIFY(false == testList.at(2).mEnabled); - QVERIFY(true == testList.at(3).mEnabled); + QVERIFY(PhoneInCallCmdDeactivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdSwap == testList[1].mCommandId); + QVERIFY(PhoneInCallCmdJoinToConference == testList[2].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[3].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(false == testList[1].mIsEnabled); + QVERIFY(false == testList[2].mIsEnabled); + QVERIFY(true == testList[3].mIsEnabled); testList.clear(); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_CALLSETUP_EMPTY_DTMFDIALER_CBA); QCOMPARE(4,testList.count()); - QVERIFY(PhoneInCallCmdDeactivateIhf == testList.at(0).mCommandId); - QVERIFY(PhoneInCallCmdSwap == testList.at(1).mCommandId); - QVERIFY(PhoneInCallCmdJoinToConference == testList.at(2).mCommandId); - QVERIFY(PhoneInCallCmdOpenDialer == testList.at(3).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); - QVERIFY(false == testList.at(1).mEnabled); - QVERIFY(false == testList.at(2).mEnabled); - QVERIFY(true == testList.at(3).mEnabled); + QVERIFY(PhoneInCallCmdDeactivateIhf == testList[0].mCommandId); + QVERIFY(PhoneInCallCmdSwap == testList[1].mCommandId); + QVERIFY(PhoneInCallCmdJoinToConference == testList[2].mCommandId); + QVERIFY(PhoneInCallCmdOpenDialer == testList[3].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); + QVERIFY(false == testList[1].mIsEnabled); + QVERIFY(false == testList[2].mIsEnabled); + QVERIFY(true == testList[3].mIsEnabled); testList.clear(); } @@ -625,21 +564,21 @@ PhoneUIQtButtonsController* buttonsController = m_resourceAdapter->buttonsController(); - QList testList; + QList testList; buttonsController->setButtonFlags(PhoneUIQtButtonsController::BluetoothAvailable,true); buttonsController->setButtonFlags(PhoneUIQtButtonsController::IhfAsPushButton,false); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCALL_BTAA_CBA); QVERIFY(0 < testList.count()); - QVERIFY(PhoneInCallCmdBtHandsfree == testList.at(0).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); + QVERIFY(PhoneInCallCmdBtHandsfree == testList[0].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); testList.clear(); buttonsController->setButtonFlags(PhoneUIQtButtonsController::Btaa,true); testList = m_resourceAdapter->convertToToolBarCommandList(R_PHONEUI_CALLHANDLING_INCALL_BTAA_CBA); QVERIFY(0 < testList.count()); - QVERIFY(PhoneInCallCmdHandset == testList.at(0).mCommandId); - QVERIFY(true == testList.at(0).mEnabled); + QVERIFY(PhoneInCallCmdHandset == testList[0].mCommandId); + QVERIFY(true == testList[0].mIsEnabled); testList.clear(); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/ut_phoneresourceadapter.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/ut_phoneresourceadapter.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/ut_phoneresourceadapter.pro Fri Oct 15 12:58:46 2010 +0300 @@ -45,7 +45,6 @@ HEADERS += ../../inc/phoneuiqtbuttonscontroller.h SOURCES += ../../src/phoneuiqtbuttonscontroller.cpp SOURCES += ../../../../tsrc/mocks/orbit/mock_hbicon.cpp -SOURCES += ../../../../tsrc/mocks/phoneuiview2/mock_phoneaction.cpp SOURCES += ../../../../tsrc/mocks/orbit/mock_hbaction.cpp SOURCES += unit_tests.cpp diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/hb_stub.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/hb_stub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/hb_stub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -17,7 +17,6 @@ #include -QString hbTrId(const char *id, int n) { return QString(id); }; HbAction::HbAction(QObject *parent) : QAction(parent), d_ptr(0) @@ -29,13 +28,8 @@ { } -HbAction::~HbAction() -{ -} - -int HbAction::qt_metacall(enum QMetaObject::Call, int, void * *) {}; -void* HbAction::qt_metacast(char const *) {}; -struct QMetaObject const * HbAction::metaObject(void) const {}; +HbAction::~HbAction() {} +void HbAction::setIcon(const HbIcon &icon) {} #include @@ -62,15 +56,3 @@ { } -#include "phoneaction.h" - -PhoneAction::PhoneAction () : - m_text (QString ()), m_command (-1), m_icon (0), m_disabled(false), - m_role(PhoneAction::None) -{ -} - -PhoneAction::~PhoneAction () -{ -} - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/unit_tests.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -49,8 +49,8 @@ // From PhoneUIQtViewIF BubbleManagerIF& bubbleManager (); - void addBubbleCommand (int bubbleId, const PhoneAction& action); - void clearBubbleCommands (int bubbleId); + void addBubbleCommand (int bubbleId, HbAction *action) {}; + void clearBubbleCommands (int bubbleId) {}; void addParticipantListAction( int commandId, const QString &text, @@ -58,7 +58,7 @@ void clearParticipantListActions(); void hideToolbar () { }; void showToolbar () { m_showToolbarCalled = true; }; - void setToolbarActions (const QList& actions) {m_toolbarActionCount = actions.count(); }; + void setToolbarActions (const QList &actions) {m_toolbarActionCount = actions.count(); }; int volumeSliderValue () { m_volumeSliderValueCalled = true; return 5; }; void removeVolumeSlider () { m_removeVolumeSliderCalled = true; }; void setVolumeSliderValue ( @@ -78,7 +78,8 @@ void clearAndHideDialpad() { m_clearAndHideDialpadCalled = true;}; void clearDialpad() {}; void bringToForeground() {}; - void setMenuActions(const QList& ) { m_setMenuActionsCalled = true;}; + void hide() {}; + void setMenuActions(const QList & ) { m_setMenuActionsCalled = true;}; void shutdownPhoneApp() {}; void setBackButtonVisible(bool ) {}; HbMenu &menuReference(){ HbMenu* menu = NULL; return *menu;}; @@ -221,17 +222,6 @@ return *this; } -void TestPhoneUiCommandController::addBubbleCommand ( - int bubbleId, const PhoneAction& action) -{ - -} - -void TestPhoneUiCommandController::clearBubbleCommands (int bubbleId) -{ - -} - void TestPhoneUiCommandController::addParticipantListAction( int commandId, const QString& text, @@ -325,7 +315,7 @@ callStates[callId] = EPEStateConnected; serviceIds[callId] = serviceId; - QMap actions = + QList actions = m_commandController->pushButtonActionsForCall( callState, emergencyCall, @@ -334,9 +324,9 @@ serviceId, callId); - QVERIFY(0buttonsController()-> @@ -378,8 +368,8 @@ serviceId, callId); - QVERIFY(0pushButtonActionsForCall( @@ -566,8 +556,8 @@ serviceId, callId); - QVERIFY(0buttonsController()-> @@ -649,8 +639,8 @@ serviceId, callId); - QVERIFY(0pushButtonActionsForCall( @@ -661,8 +651,8 @@ serviceId, 3); - QVERIFY(0pushButtonActionsForCall( @@ -673,8 +663,8 @@ serviceId, 2); - QVERIFY(0 actions = + QList actions = m_commandController->toolBarActions( R_PHONEUI_DIALER_CBA, callStates, @@ -710,10 +700,10 @@ callId); QVERIFY(4==actions.count()); - QVERIFY(EPhoneInCallCmdActivateIhf == actions.at(0)->command()); - QVERIFY(EPhoneInCallCmdHold == actions.at(1)->command()); - QVERIFY(EPhoneInCallCmdContacts == actions.at(2)->command()); - QVERIFY(EPhoneInCallCmdDialer == actions.at(3)->command()); + QVERIFY(EPhoneInCallCmdActivateIhf == actions[0]->property("command")); + QVERIFY(EPhoneInCallCmdHold == actions[1]->property("command")); + QVERIFY(EPhoneInCallCmdContacts == actions[2]->property("command")); + QVERIFY(EPhoneInCallCmdDialer == actions[3]->property("command")); qDeleteAll(actions); actions.clear(); @@ -772,10 +762,10 @@ callId); QVERIFY(4==actions.count()); - QVERIFY(EPhoneInCallCmdJoin == actions.at(0)->command()); - QVERIFY(EPhoneInCallCmdUnhold == actions.at(1)->command()); - QVERIFY(EPhoneInCallCmdEndThisOutgoingCall == actions.at(2)->command()); - QVERIFY(EPhoneCallComingCmdSilent == actions.at(3)->command()); + QVERIFY(EPhoneInCallCmdJoin == actions[0]->property("command")); + QVERIFY(EPhoneInCallCmdUnhold == actions[1]->property("command")); + QVERIFY(EPhoneInCallCmdEndThisOutgoingCall == actions[2]->property("command")); + QVERIFY(EPhoneCallComingCmdSilent == actions[3]->property("command")); qDeleteAll(actions); actions.clear(); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/ut_phoneuicommandcontroller.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/ut_phoneuicommandcontroller.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/ut_phoneuicommandcontroller.pro Fri Oct 15 12:58:46 2010 +0300 @@ -44,6 +44,7 @@ TARGET.CAPABILITY = ALL -TCB DEFINES += FT_SYMBIAN_INTEGRATION DEFINES += BUILD_PHONEUIQTVIEWADAPTER + DEFINES += BUILD_HB_CORE } # Input diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtbuttonscontroller/ut_phoneuiqtbuttonscontroller.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtbuttonscontroller/ut_phoneuiqtbuttonscontroller.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtbuttonscontroller/ut_phoneuiqtbuttonscontroller.pro Fri Oct 15 12:58:46 2010 +0300 @@ -37,3 +37,5 @@ HEADERS += ../../inc/phoneuiqtbuttonscontroller.h include(../../../../tsrc/common/phonetest.pri) + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphoneringingtonecontroller_stub.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphoneringingtonecontroller_stub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,275 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -// INCLUDE FILES -#include -#include "cphoneringingtonecontroller.h" -#include "phonelogger.h" -#include "cphoneringingtone.h" -#include "tphonecmdparamringtone.h" -#include "cphonecenrepproxy.h" -#include "cphoneringingtoneplayer.h" -#include "cphonettsplayer.h" - - -bool m_EPhoneViewMuteRingToneOnAnswer_called; -bool m_EPhoneViewStopRingTone_called; -bool m_EPhoneViewMuteRingTone_called; -bool m_EPhoneViewPlayRingTone_called; - - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::NewL -// ----------------------------------------------------------------------------- -// -EXPORT_C CPhoneRingingToneController* CPhoneRingingToneController::NewL() - { - CPhoneRingingToneController* self = - new ( ELeave ) CPhoneRingingToneController(); - - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::CPhoneRingingToneController -// ----------------------------------------------------------------------------- -// -CPhoneRingingToneController::CPhoneRingingToneController() - { - m_EPhoneViewMuteRingToneOnAnswer_called = false; - m_EPhoneViewStopRingTone_called = false; - m_EPhoneViewMuteRingTone_called = false; - m_EPhoneViewPlayRingTone_called = false; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ConstructL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::ConstructL() - { - - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::~CPhoneRingingToneController -// ----------------------------------------------------------------------------- -// -CPhoneRingingToneController::~CPhoneRingingToneController() - { - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayRingToneL -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::PlayRingToneL( - TPhoneCommandParam* aCommandParam ) - { - - if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdRingTone ) - { - m_EPhoneViewPlayRingTone_called = true; - } - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayAudioRingTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::PlayAudioRingTone( - TInt aVolume, - TProfileRingingType aRingingType ) - { - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::MuteRingingToneOnAnswer -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::MuteRingingToneOnAnswer() - { - m_EPhoneViewMuteRingToneOnAnswer_called = true; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::MuteRingingTone -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::MuteRingingTone() - { - m_EPhoneViewMuteRingTone_called = true; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::StopPlaying -// ----------------------------------------------------------------------------- -// -EXPORT_C void CPhoneRingingToneController::StopPlaying() - { - m_EPhoneViewStopRingTone_called = true; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::DoMuteRingingTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::DoMuteRingingTone() - { - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ConvertVideoRingingType -// ----------------------------------------------------------------------------- -// -MPhoneVideoPlayer::TPlayMode CPhoneRingingToneController::ConvertVideoRingingType( - TProfileRingingType aRingingType ) - { - MPhoneVideoPlayer::TPlayMode playMode; - - - return playMode; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::SetVideoPlayer -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::SetVideoPlayer( - MPhoneVideoPlayer* aVideoPlayer ) - { - iVideoPlayer = aVideoPlayer; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayVideoRingingTone -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::PlayVideoRingingTone( - const CPhoneRingingTone& aRingingTone, - TInt aVolume, - TProfileRingingType aRingingType, - TBool aPersonalTone ) - { - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::HandleVideoPlayerError -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::HandleVideoPlayerError( - TPhoneVideoPlayerErrorEvent /*aEvent*/, - TInt aError ) - { - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::HandleVideoPlayerInitComplete -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::HandleVideoPlayerInitComplete() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::HandleVideoPlayerInitComplete()" ); - - // cancel guarding timer - //iTimer->Cancel(); - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::HandleVideoPlayerPlayingComplete -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::HandleVideoPlayerPlayingComplete() - { - //__LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::HandleVideoPlayerPlayingComplete()" ); - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::PlayDefaultVideoAsync -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::PlayDefaultVideoAsync() - { - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ExtendedSecurity -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingToneController::ExtendedSecurity() const - { - //__LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::ExtendedSecurity()" ); - return EFalse; - - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::CoverUIPlayVideoRingingToneL -// ----------------------------------------------------------------------------- -// -TBool CPhoneRingingToneController::CoverUIPlayVideoRingingToneL( - const CPhoneRingingTone& aRingingTone ) - { - //__LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::CoverUIPlayVideoRingingToneL()" ); - - TBool showVideo( EFalse ); - /* - RBuf8 data; - CleanupClosePushL( data ); - data.CreateL( aRingingTone.FileName().Length() ); - data.Copy( aRingingTone.FileName() ); - TInt err = iMediatorSender->IssueCommand( - EPhoneCmdCoverUiShowMultimediaRingingTone, - data ); - if ( err == KErrNone ) - { - showVideo = ETrue; - iActiveCoverUICommand = ETrue; - } - CleanupStack::PopAndDestroy(); //data - */ - return showVideo; - } - -// ----------------------------------------------------------------------------- -// CPhoneRingingToneController::ShowMultimediaRingingToneResponseL -// ----------------------------------------------------------------------------- -// -void CPhoneRingingToneController::ShowMultimediaRingingToneResponseL( - TInt aStatus ) - { - //__LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::ShowMultimediaRingingToneResponseL()" ); - - } - - - -// End of File diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonenotecontroller_stub.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonenotecontroller_stub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonenotecontroller_stub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -19,6 +19,7 @@ #include "phoneresourceadapter.h" #include #include +#include bool m_showGlobalNoteCalled; bool m_showQueryCalled; @@ -28,8 +29,10 @@ bool m_removeQueryCalled; bool m_removeGlobalWaitNoteCalled; -PhoneNoteController::PhoneNoteController(QObject *parent) : QObject (parent) +PhoneNoteController::PhoneNoteController(XQSystemToneService& toneservice, + QObject *parent) : QObject (parent) { + Q_UNUSED(toneservice); m_showGlobalNoteCalled = false; } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/rphonetoneclient_stub.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/rphonetoneclient_stub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,88 @@ +/* +* 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 FILES + +bool m_EPhoneViewMuteRingToneOnAnswer_called; +bool m_EPhoneViewStopRingTone_called; +bool m_EPhoneViewMuteRingTone_called; +bool m_EPhoneViewPlayRingTone_called; + + +// INCLUDE FILES +#include +#include +#include + +#include "rphonetoneclient.h" +#include "tphonecmdparamringtone.h" + + + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::RPhoneToneClient +// ----------------------------------------------------------------------------- +// +EXPORT_C RPhoneToneClient::RPhoneToneClient() + { + } + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::~RPhoneToneClient +// ----------------------------------------------------------------------------- +// +EXPORT_C RPhoneToneClient::~RPhoneToneClient() + { + m_EPhoneViewMuteRingToneOnAnswer_called = false; + m_EPhoneViewStopRingTone_called = false; + m_EPhoneViewMuteRingTone_called = false; + m_EPhoneViewPlayRingTone_called = false; + + } + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::Connect +// ----------------------------------------------------------------------------- +// +EXPORT_C TInt RPhoneToneClient::Connect() + { + return KErrNone; + } + + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::PlayRingingToneL +// ----------------------------------------------------------------------------- +// +EXPORT_C void RPhoneToneClient::PlayRingingToneL( TPhoneCommandParam *aCommandParam ) + { + if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdRingTone ) + { + m_EPhoneViewPlayRingTone_called = true; + } + } + +// ----------------------------------------------------------------------------- +// RPhoneToneClient::StopPlaying +// ----------------------------------------------------------------------------- +// +EXPORT_C void RPhoneToneClient::StopPlayingL() + { + m_EPhoneViewStopRingTone_called = true; + } + +// End of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -24,6 +24,7 @@ #include #include #include +#include #include "phoneuiqtviewadapter.h" #include "tphonecmdparaminteger.h" #include "tphonecmdparamaudiooutput.h" @@ -75,6 +76,7 @@ extern int m_setPrivateFromConferenceCallId; extern int m_removeCallHeaderCallId; extern bool m_isVoiceCall; +extern bool m_EPhoneViewPlayHandsFreeActivatedTone_called; // Own assert initialization /*void qt_assert(const char *assertion, const char *file, int line) @@ -91,7 +93,7 @@ // From PhoneUIQtViewIF BubbleManagerIF& bubbleManager (); - void addBubbleCommand (int bubbleId, const PhoneAction& action); + void addBubbleCommand (int bubbleId, HbAction *action); void clearBubbleCommands (int bubbleId); void addParticipantListAction( int commandId, @@ -100,7 +102,7 @@ void clearParticipantListActions(); void hideToolbar () { }; void showToolbar () { m_showToolbarCalled = true; }; - void setToolbarActions (const QList& actions) {m_toolbarActionCount = actions.count(); }; + void setToolbarActions (const QList &actions) {m_toolbarActionCount = actions.count(); }; int volumeSliderValue () { m_volumeSliderValueCalled = true; return 5; }; void removeVolumeSlider () { m_removeVolumeSliderCalled = true; }; void setVolumeSliderValue ( @@ -120,7 +122,8 @@ void clearDialpad() { m_clearDialpadCalled = true; }; void clearAndHideDialpad() { m_clearAndHideDialpadCalled = true;}; void bringToForeground() {}; - void setMenuActions(const QList& ) { m_setMenuActionsCalled = true;}; + void hide() {}; + void setMenuActions(const QList & ) { m_setMenuActionsCalled = true;}; void shutdownPhoneApp() {}; void setBackButtonVisible(bool ) {}; HbMenu &menuReference(){return m_menu;}; @@ -222,9 +225,7 @@ void testHandleCommandL (); void testGetSelectedConferenceMember (); void testSetAudioPath (); - void testMuteRingToneOnAnswer (); void testStopRingTone (); - void testMuteRingTone (); void testPlayRingTone (); void testShowGlobalNote (); void testSetExpandActions(); @@ -246,6 +247,7 @@ void testOpenLogs(); void testSetFlags(); void testCaptureEndKey(); + void testPlayHandsFreeActivatedTone(); private: PhoneUIQtViewAdapter *m_adapter; // class under test @@ -317,13 +319,13 @@ } void TestPhoneUIQtViewAdapter::addBubbleCommand ( - int bubbleId, const PhoneAction& action) + int bubbleId, HbAction* action) { if (m_actionMap.keys().contains(bubbleId)) { - m_actionMap.value(bubbleId)->append(action.command()); + m_actionMap.value(bubbleId)->append(action->property("command").toInt()); } else { QList *list = new QList(); - list->append(action.command()); + list->append(action->property("command").toInt()); m_actionMap.insert( bubbleId, list); } } @@ -408,7 +410,7 @@ { TPhoneCmdParamCallStateData data; data.SetCallState (EPEStateConnected); - m_adapter->HandleCommandL (EPhoneViewGetCallIdByState, &data); + m_adapter->ExecuteCommand (EPhoneViewGetCallIdByState, &data); QCOMPARE (data.CallId(), 0); } @@ -762,24 +764,12 @@ } -void TestPhoneUIQtViewAdapter::testMuteRingToneOnAnswer () -{ - m_adapter->ExecuteCommandL(EPhoneViewMuteRingToneOnAnswer); - QVERIFY( m_EPhoneViewMuteRingToneOnAnswer_called == true ); -} - void TestPhoneUIQtViewAdapter::testStopRingTone () { m_adapter->ExecuteCommandL(EPhoneViewStopRingTone); QVERIFY( m_EPhoneViewStopRingTone_called == true ); } -void TestPhoneUIQtViewAdapter::testMuteRingTone () -{ - m_adapter->ExecuteCommandL(EPhoneViewMuteRingTone); - QVERIFY( m_EPhoneViewMuteRingTone_called == true ); -} - void TestPhoneUIQtViewAdapter::testPlayRingTone () { TPhoneCmdParamRingTone ringToneParam; @@ -833,6 +823,7 @@ m_showDialpadCalled = false; m_hideDialpadCalled = false; + m_isDialpadVisible = true; param.SetBoolean(EFalse); m_adapter->ExecuteCommandL(EPhoneViewSetNumberEntryVisible, ¶m); @@ -1103,5 +1094,12 @@ QVERIFY(m_capturedKey == Qt::Key_0); } +void TestPhoneUIQtViewAdapter::testPlayHandsFreeActivatedTone() +{ + m_adapter->ExecuteCommandL(EPhoneViewPlayHandsFreeActivatedTone); + QVERIFY( m_EPhoneViewPlayHandsFreeActivatedTone_called == true ); +} + + PHONE_UITEST_MAIN(TestPhoneUIQtViewAdapter) #include "unit_tests.moc" diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro Fri Oct 15 12:58:46 2010 +0300 @@ -77,13 +77,15 @@ SOURCES += phoneuiqtbuttonscontroller_stub.cpp HEADERS += phonebubblewrapper.h SOURCES += phonebubblewrapper_stub.cpp -SOURCES += cphoneringingtonecontroller_stub.cpp +SOURCES += rphonetoneclient_stub.cpp SOURCES += cphonemediatorfactory_stub.cpp SOURCES += cphonemediatorsender_stub.cpp SOURCES += phonecallheadermanager_stub.cpp SOURCES += phonenotecontroller_stub.cpp HEADERS += ../../inc/phoneapplauncher.h SOURCES += phoneapplauncher_stub.cpp +HEADERS += xqsystemtoneservice.h +SOURCES += xqsystemtoneservice_stub.cpp SOURCES += unit_tests.cpp diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/xqsystemtoneservice.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/xqsystemtoneservice.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,133 @@ +/** 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: +* +*/ + + +#ifndef XQSYSTEMTONESERVICE_H +#define XQSYSTEMTONESERVICE_H + +#include +#include + + +class XQSystemToneService : public QObject +{ + Q_OBJECT + +public: + +/** + * Supported tone types. +*/ + enum ToneType { + // Capture Tones + BurstModeTone = CSystemToneService::EBurstMode, + CaptureTone = CSystemToneService::ECapture, + CallRecordingTone = CSystemToneService::ECallRecording, + RecordingStartTone = CSystemToneService::ERecordingStart, + RecordingStopTone = CSystemToneService::ERecordingStop, + SelfTimerTone = CSystemToneService::ESelfTimer, + + // General Tones + ConfirmationBeepTone = CSystemToneService::EConfirmationBeep, + DefaultBeepTone = CSystemToneService::EDefaultBeep, + ErrorBeepTone = CSystemToneService::EErrorBeep, + InformationBeepTone = CSystemToneService::EInformationBeep, + WarningBeepTone = CSystemToneService::EWarningBeep, + IntegratedHandsFreeActivatedTone = CSystemToneService::EIntegratedHandsFreeActivated, + + // Key Tones + TouchScreenTone = CSystemToneService::ETouchScreen, + + // Location Tones + LocationRequestTone = CSystemToneService::ELocationRequest, + + // Messaging Tones + ChatAlertTone = CSystemToneService::EChatAlert, + EmailAlertTone = CSystemToneService::EEmailAlert, + MmsAlertTone = CSystemToneService::EMmsAlert, + SmsAlertTone = CSystemToneService::ESmsAlert, + DeliveryReportTone = CSystemToneService::EDeliveryReport, + MessageSendFailureTone = CSystemToneService::EMessageSendFailure, + + // Power Tones + BatteryLowTone = CSystemToneService::EBatteryLow, + BatteryRechargedTone = CSystemToneService::EBatteryRecharged, + PowerOnTone = CSystemToneService::EPowerOn, + PowerOffTone = CSystemToneService::EPowerOff, + WakeUpTone = CSystemToneService::EWakeUp, + WrongChargerTone = CSystemToneService::EWrongCharger, + + // Telephony Tones + AutomaticRedialCompleteTone = CSystemToneService::EAutomaticRedialComplete, + + // Voice Recognition Tones + VoiceStartTone = CSystemToneService::EVoiceStart, + VoiceErrorTone = CSystemToneService::EVoiceError, + VoiceAbortTone = CSystemToneService::EVoiceAbort + }; + + enum AlarmType { + // Calendar Tones + CalendarAlarmTone = CSystemToneService::ECalendarAlarm, + ClockAlarmTone = CSystemToneService::EClockAlarm, + ToDoAlarmTone = CSystemToneService::EToDoAlarm, + + // Telephony Alarms + IncomingCallTone = CSystemToneService::EIncomingCall, + IncomingCallLine2Tone = CSystemToneService::EIncomingCallLine2, + IncomingDataCallTone = CSystemToneService::EIncomingDataCall, + }; + + +public: +/** +* XQSystemToneService object constructor. +*/ +XQSystemToneService(QObject *parent = 0); + +/** +* Simple destructor. +*/ +~XQSystemToneService(); + +/** +* Play selected tone. +* +* @param toneType selected tone type. +*/ + void playTone(ToneType toneType); + + + void playAlarm(AlarmType alarmType, unsigned int& contextId); + + + void stopAlarm(unsigned int contextId); + + + void playAlarm(ToneType toneType, unsigned int& contextId); + + + +void toneStarted(); + +void alarmStarted(unsigned int contextId); + +void alarmFinished(unsigned int contextId); + + +}; + +#endif /*SYSTEMTONESERVICE_H*/ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/xqsystemtoneservice_stub.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/xqsystemtoneservice_stub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,127 @@ +/** 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: +* +*/ + + +bool m_EPhoneViewPlayHandsFreeActivatedTone_called; + +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// XQSystemToneService::XQSystemToneService +// ----------------------------------------------------------------------------- +// +XQSystemToneService::XQSystemToneService( + QObject * parent ) + : + QObject( parent) + { + + } + +// ----------------------------------------------------------------------------- +// XQSystemToneService::~XQSystemToneService +// ----------------------------------------------------------------------------- +// +XQSystemToneService::~XQSystemToneService( ) + { + m_EPhoneViewPlayHandsFreeActivatedTone_called = false; + } + + +// ----------------------------------------------------------------------------- +// XQSystemToneService::playTone +// ----------------------------------------------------------------------------- +// +void XQSystemToneService::playTone( + ToneType toneType ) + { + Q_UNUSED(toneType); + m_EPhoneViewPlayHandsFreeActivatedTone_called = true; + } + + +// ----------------------------------------------------------------------------- +// XQSystemToneService::playAlarm +// ----------------------------------------------------------------------------- +// +void XQSystemToneService::playAlarm( + AlarmType alarmType, + unsigned int & contextId ) + { + Q_UNUSED(alarmType); + Q_UNUSED(contextId); + } + + +// ----------------------------------------------------------------------------- +// XQSystemToneService::stopAlarm +// ----------------------------------------------------------------------------- +// +void XQSystemToneService::stopAlarm( + unsigned int contextId ) + { + Q_UNUSED(contextId); + } + + +// ----------------------------------------------------------------------------- +// XQSystemToneService::playAlarm +// ----------------------------------------------------------------------------- +// +void XQSystemToneService::playAlarm( + ToneType toneType, + unsigned int & contextId ) + { + Q_UNUSED(toneType); + Q_UNUSED(contextId); + } + + +// ----------------------------------------------------------------------------- +// XQSystemToneService::toneStarted +// ----------------------------------------------------------------------------- +// +void XQSystemToneService::toneStarted( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQSystemToneService::alarmStarted +// ----------------------------------------------------------------------------- +// +void XQSystemToneService::alarmStarted( + unsigned int contextId ) + { + Q_UNUSED(contextId); + } + + +// ----------------------------------------------------------------------------- +// XQSystemToneService::alarmFinished +// ----------------------------------------------------------------------------- +// +void XQSystemToneService::alarmFinished( + unsigned int contextId ) + { + Q_UNUSED(contextId); + } + + diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/unit_tests.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -60,7 +60,7 @@ // From PhoneUIQtViewIF BubbleManagerIF& bubbleManager () {}; - void addBubbleCommand (int , const PhoneAction& ) {}; + void addBubbleCommand (int , HbAction * ) {}; void clearBubbleCommands (int ) {}; void addParticipantListAction( int , @@ -69,7 +69,7 @@ void clearParticipantListActions() {}; void hideToolbar () {}; void showToolbar () {}; - void setToolbarActions (const QList& ) {}; + void setToolbarActions (const QList & ) {}; int volumeSliderValue () {}; void removeVolumeSlider () {}; void setVolumeSliderValue ( @@ -87,7 +87,8 @@ void clearAndHideDialpad() {}; void clearDialpad() {}; void bringToForeground() { m_bringToForegroundCalled = true;}; - void setMenuActions(const QList& ) {}; + void hide() {}; + void setMenuActions(const QList & ) {}; void shutdownPhoneApp() {}; void setBackButtonVisible(bool ) {}; HbMenu &menuReference() {}; @@ -219,7 +220,7 @@ QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), ECoeWinPriorityAlwaysAtFront + 100); // send backgroud is called last - m_handler->sendToBackground(false); + m_handler->sendToBackground(); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); } @@ -259,7 +260,7 @@ QVERIFY(m_bringToForegroundCalled == false); // send backgroud is called last - m_handler->sendToBackground(false); + m_handler->sendToBackground(); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); } @@ -303,7 +304,7 @@ // send backgroud is called last - m_handler->sendToBackground(false); + m_handler->sendToBackground(); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); @@ -317,6 +318,7 @@ // bringToForeground is call m_handler->bringToForeground(); + m_handler->windowVisibilityChange(true); QVERIFY(m_bringToForegroundCalled); QVERIFY(g_disableKeyGuardCalled); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0); @@ -324,7 +326,8 @@ cleanup(); // send backgroud is called last - m_handler->sendToBackground(false); + m_handler->sendToBackground(); + m_handler->windowVisibilityChange(false); QVERIFY(!g_enableKeyGuardCalled); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); @@ -336,6 +339,7 @@ // bringToForeground is call m_handler->bringToForeground(); + m_handler->windowVisibilityChange(true); QVERIFY(m_bringToForegroundCalled); QVERIFY(g_disableKeyGuardCalled); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0); @@ -343,7 +347,8 @@ cleanup(); // send backgroud is called last - m_handler->sendToBackground(false); + m_handler->sendToBackground(); + m_handler->windowVisibilityChange(false); QVERIFY(g_enableKeyGuardCalled); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); @@ -355,6 +360,7 @@ // bringToForeground is call m_handler->bringToForeground(); + m_handler->windowVisibilityChange(true); QVERIFY(m_bringToForegroundCalled); QVERIFY(g_disableKeyGuardCalled); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0); @@ -363,7 +369,9 @@ cleanup(); // Test that keyguard is not enabled when phone is background CEikonEnv::Static()->RootWin().SetOrdinalPosition(-1, ECoeWinPriorityNormal); - m_handler->sendToBackground(false); + m_handler->windowVisibilityChange(false); + m_handler->sendToBackground(); + m_handler->windowVisibilityChange(false); QVERIFY(!g_enableKeyGuardCalled); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); @@ -375,6 +383,7 @@ // bringToForeground is call m_handler->bringToForeground(); + m_handler->windowVisibilityChange(true); QVERIFY(m_bringToForegroundCalled); QVERIFY(g_disableKeyGuardCalled); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0); @@ -382,13 +391,15 @@ cleanup(); m_handler->bringToForeground(); + m_handler->windowVisibilityChange(true); QVERIFY(m_bringToForegroundCalled); QVERIFY(g_disableKeyGuardCalled); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), ECoeWinPriorityAlwaysAtFront + 100); cleanup(); - m_handler->sendToBackground(false); + m_handler->sendToBackground(); + m_handler->windowVisibilityChange(false); QVERIFY(g_enableKeyGuardCalled); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); @@ -398,6 +409,7 @@ // bringToForeground is call m_handler->bringToForeground(); + m_handler->windowVisibilityChange(true); QVERIFY(m_bringToForegroundCalled); QVERIFY(g_disableKeyGuardCalled); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0); @@ -406,13 +418,15 @@ cleanup(); g_keyGuardEnabled = true; m_handler->bringToForeground(); + m_handler->windowVisibilityChange(true); QVERIFY(m_bringToForegroundCalled); QVERIFY(g_disableKeyGuardCalled); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), ECoeWinPriorityAlwaysAtFront + 100); cleanup(); - m_handler->sendToBackground(false); + m_handler->sendToBackground(); + m_handler->windowVisibilityChange(false); QVERIFY(g_enableKeyGuardCalled); QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0); QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/unit_tests.cpp --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -41,7 +41,7 @@ BubbleManagerIF& bubbleManager (){}; void addBubbleCommand ( int , - const PhoneAction& ){}; + HbAction * ){}; void clearBubbleCommands (int ){}; void addParticipantListAction( int , @@ -50,7 +50,7 @@ void clearParticipantListActions(){}; void hideToolbar () {}; void showToolbar () {}; - void setToolbarActions (const QList& ){}; + void setToolbarActions (const QList & ){}; int volumeSliderValue () { return 0; }; void removeVolumeSlider () {}; void setVolumeSliderValue ( @@ -68,7 +68,8 @@ void clearAndHideDialpad(){}; void clearDialpad() {}; void bringToForeground() {}; - void setMenuActions(const QList& ){}; + void hide() {}; + void setMenuActions(const QList & ){}; void shutdownPhoneApp() {}; void setBackButtonVisible(bool ) {}; HbMenu &menuReference() {}; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/ut_telephonyservice.pro --- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/ut_telephonyservice.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/ut_telephonyservice.pro Fri Oct 15 12:58:46 2010 +0300 @@ -22,17 +22,19 @@ CONFIG += hb CONFIG += qtestlib -INCLUDEPATH += \epoc32\include\platform\mw \ - \epoc32\include\platform \ - \epoc32\include\platform\app \ +INCLUDEPATH += /epoc32/include/platform/mw \ + /epoc32/include/platform \ + /epoc32/include/platform/app \ ../../../phoneuiutils/inc/ \ ../../../phoneuiview2/inc \ + ../../../phoneringingtoneplayer/inc \ ../../../../inc \ ../../../phoneui2/srcdata \ ../../../../tsrc/common LIBS += -lphoneuiutils \ + -lphoneringingtoneplayer \ -lxqservice \ -lxqserviceutil \ -lmocklib \ diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/inc/cphonealerting.h --- a/phoneapp/phoneuistates/inc/cphonealerting.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/inc/cphonealerting.h Fri Oct 15 12:58:46 2010 +0300 @@ -89,11 +89,6 @@ * @param aCommand - selected command */ IMPORT_C virtual TBool HandleCommandL( TInt aCommand ); - - /** - * Check is alerting call Video call - */ - TBool IsVideoCallAlertingL(); /** * From CPhoneState. diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonealerting.cpp --- a/phoneapp/phoneuistates/src/cphonealerting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonealerting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -25,7 +25,6 @@ #include "mphonestatemachine.h" #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "phoneviewcommanddefinitions.h" #include "phoneui.hrh" #include "cphonemainresourceresolver.h" @@ -230,26 +229,6 @@ "CPhoneAlerting::HandleCommandL()" ); return CPhoneGsmInCall::HandleCommandL( aCommand ); } - -// ----------------------------------------------------------- -// CPhoneAlerting::IsVideoCallAlertingL -// ----------------------------------------------------------- -// -TBool CPhoneAlerting::IsVideoCallAlertingL() - { - __LOGMETHODSTARTEND( EPhoneUIStates, - "CPhoneAlerting::IsVideoCallAlerting()" ); - TBool retVal = EFalse; - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if ( callStateData.CallId() > KErrNotFound ) - { - retVal = IsVideoCall( callStateData.CallId() ); - } - return retVal; - } // ----------------------------------------------------------- // CPhoneAlerting::CheckIfShowTerminationNote diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -28,7 +28,6 @@ #include "tphonecmdparaminteger.h" #include "tphonecmdparamcallheaderdata.h" #include "tphonecmdparamglobalnote.h" -#include "tphonecmdparamcallstatedata.h" #include "phoneviewcommanddefinitions.h" #include "phoneui.hrh" #include "cphonemainresourceresolver.h" @@ -37,6 +36,7 @@ #include "phonelogger.h" #include "cphonemediatorfactory.h" #include "cphonemediatorsender.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -131,16 +131,13 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); // Find out do we have waiting or outgoing call left - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); - - if( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + + if( callId > KErrNotFound ) { BringIncomingToForegroundL(); - SetRingingTonePlaybackL( callStateData.CallId() ); - UpdateCallHeaderAndUiCommandsL( callStateData.CallId() ); + SetRingingTonePlaybackL( callId ); + UpdateCallHeaderAndUiCommandsL( callId ); SetBackButtonActive(EFalse); iStateMachine->ChangeState( EPhoneStateIncoming ); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconference.cpp --- a/phoneapp/phoneuistates/src/cphoneconference.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconference.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -38,9 +38,9 @@ #include "phonestatedefinitions.h" #include "tphonecmdparamglobalnote.h" #include "phonestatedefinitionsgsm.h" -#include "tphonecmdparamcallstatedata.h" #include "cphonekeys.h" #include "phonelogger.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -319,12 +319,8 @@ case EOneActiveCall: { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if( callId > KErrNotFound ) { UpdateUiCommands(); iStateMachine->ChangeState( EPhoneStateWaitingInSingle ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -21,7 +21,6 @@ #include "mphonestatemachine.h" #include "phoneviewcommanddefinitions.h" #include "tphonecmdparamcallheaderdata.h" -#include "tphonecmdparamcallstatedata.h" #include "phonestatedefinitionsgsm.h" #include "phonelogger.h" #include "tphonecmdparamboolean.h" @@ -30,6 +29,7 @@ #include "phonerssbase.h" #include "tphonecmdparamglobalnote.h" #include "phoneui.hrh" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -275,13 +275,9 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndCallSetup::HandleConferenceIdleL()"); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); - - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if ( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnecting ); + if ( callId > KErrNotFound ) { // Go to alerting and single state UpdateUiCommands(); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -30,7 +30,6 @@ #include "phonelogger.h" #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "cphonemainresourceresolver.h" #include "phonerssbase.h" #include "tphonecmdparamglobalnote.h" diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -27,13 +27,13 @@ #include "phonelogger.h" #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "cphonemainresourceresolver.h" #include "phonerssbase.h" #include "tphonecmdparamglobalnote.h" #include "phoneui.hrh" #include "mphonestorage.h" #include "cphonecenrepproxy.h" +#include "phonecallutil.h" #include // ================= MEMBER FUNCTIONS ======================= @@ -151,11 +151,8 @@ } else { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); - if( callStateData.CallId() >= 0 ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if( callId >= 0 ) { // We have Conference and Waiting calls left MakeStateTransitionToConferenceAndWaitingL( aCallId ); @@ -266,14 +263,11 @@ { case ENoActiveCalls: // Go to incoming state { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); - if ( callStateData.CallId() != KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if ( callId != KErrNotFound ) { - UpdateCallHeaderAndUiCommandsL( callStateData.CallId() ); - SetRingingTonePlaybackL( callStateData.CallId() ); + SetRingingTonePlaybackL( callId ); + UpdateCallHeaderAndUiCommandsL( callId ); SetBackButtonActive(EFalse); iStateMachine->ChangeState( EPhoneStateIncoming ); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -29,13 +29,13 @@ #include "phonelogger.h" #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "cphonemainresourceresolver.h" #include "phonerssbase.h" #include "tphonecmdparamglobalnote.h" #include "phoneui.hrh" #include "cphonecenrepproxy.h" #include "mphonestorage.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -69,12 +69,7 @@ void CPhoneConferenceAndWaiting::ConstructL() { CPhoneConference::ConstructL(); - - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - iRingingCallId = callStateData.CallId(); + iRingingCallId = PhoneCallUtil::CallIdByState( EPEStateRinging ); } // ----------------------------------------------------------- @@ -188,14 +183,9 @@ void CPhoneConferenceAndWaiting::HandleConnectedL( TInt aCallId ) { __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConnectedL()"); - TPhoneCmdParamCallStateData callStateData; if ( iRingingCallId == KErrNotFound ) { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - iRingingCallId = callStateData.CallId(); + iRingingCallId = PhoneCallUtil::CallIdByState( EPEStateRinging ); } if ( iRingingCallId == aCallId ) @@ -232,11 +222,7 @@ __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleIdleL()"); if ( iRingingCallId == KErrNotFound ) { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - iRingingCallId = callStateData.CallId(); + iRingingCallId = PhoneCallUtil::CallIdByState( EPEStateRinging ); } if( iRingingCallId == aCallId ) @@ -283,7 +269,8 @@ { case ENoActiveCalls: // Go to incoming state { - BringIncomingToForegroundL(); + BringIncomingToForegroundL(); + SetRingingTonePlaybackL( iRingingCallId ); UpdateCallHeaderAndUiCommandsL( iRingingCallId ); if ( iNumberEntryManager->IsNumberEntryVisibleL() ) @@ -291,7 +278,6 @@ iNumberEntryManager->SetNumberEntryVisibilityL(EFalse); } - SetRingingTonePlaybackL( iRingingCallId ); SetBackButtonActive(EFalse); iStateMachine->ChangeState( EPhoneStateIncoming ); } @@ -346,11 +332,7 @@ if ( iRingingCallId == KErrNotFound ) { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - iRingingCallId = callStateData.CallId(); + iRingingCallId = PhoneCallUtil::CallIdByState( EPEStateRinging ); } TPhoneCmdParamBoolean conferenceBubbleExists; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -27,11 +27,11 @@ #include "phonelogger.h" #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" -#include "tphonecmdparamcallstatedata.h" #include "cphonemainresourceresolver.h" #include "phonerssbase.h" #include "tphonecmdparamglobalnote.h" #include "phoneui.hrh" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -237,25 +237,18 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); - - if( callStateData.CallId() > KErrNotFound ) // No need update cba's. + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnected ); + if( callId > KErrNotFound ) // No need update cba's. { UpdateUiCommands(); iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting ); } else { - callStateData.SetCallState( EPEStateHeld ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); - + callId = PhoneCallUtil::CallIdByState( EPEStateHeld ); UpdateUiCommands(); - if( callStateData.CallId() > KErrNotFound ) + if( callId > KErrNotFound ) { iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting ); } @@ -306,11 +299,8 @@ else { BeginUiUpdateLC(); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); - if( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if( callId > KErrNotFound ) { // Show the number entry if callsetup failed with number busy // etc reason. diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonegsmincall.cpp --- a/phoneapp/phoneuistates/src/cphonegsmincall.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonegsmincall.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -33,7 +33,6 @@ #include "cphonemainresourceresolver.h" #include "phoneui.hrh" -#include "tphonecmdparamcallstatedata.h" #include "tphonecmdparamcallheaderdata.h" // ================= MEMBER FUNCTIONS ======================= diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneincoming.cpp --- a/phoneapp/phoneuistates/src/cphoneincoming.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneincoming.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -30,7 +30,7 @@ #include "mphonestatemachine.h" #include "mphonestorage.h" #include "cphonecenrepproxy.h" -#include "tphonecmdparamcallstatedata.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -183,10 +183,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneIncoming::HandleIncomingL()"); - TPhoneCmdParamCallStateData callState; - callState.SetCallState( EPEStateConnected ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallIdByState, &callState ); - TInt connectedCall = callState.CallId(); + TInt connectedCall = PhoneCallUtil::CallIdByState( EPEStateConnected ); DisplayCallHeaderL( aCallId, ECheckIfNEUsedBeforeSettingVisibilityFalse ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonesingleandalerting.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -26,13 +26,13 @@ #include "tphonecmdparaminteger.h" #include "tphonecmdparamcallheaderdata.h" #include "tphonecmdparamglobalnote.h" -#include "tphonecmdparamcallstatedata.h" #include "phoneviewcommanddefinitions.h" #include "phoneui.hrh" #include "cphonemainresourceresolver.h" #include "phonerssbase.h" #include "phonestatedefinitionsgsm.h" #include "phonelogger.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -173,12 +173,8 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndAlerting::HandleConnectedL()"); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if( callStateData.CallId() == aCallId ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnecting ); + if( callId == aCallId ) { UpdateCallHeaderAndUiCommandsL( aCallId ); iStateMachine->ChangeState( EPhoneStateTwoSingles ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -23,7 +23,6 @@ #include "mphonestatemachine.h" #include "phoneviewcommanddefinitions.h" #include "tphonecmdparamcallheaderdata.h" -#include "tphonecmdparamcallstatedata.h" #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" #include "phonestatedefinitionsgsm.h" @@ -32,6 +31,7 @@ #include "phoneui.hrh" #include "tphonecmdparamglobalnote.h" #include "cphonemainresourceresolver.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -155,32 +155,22 @@ } else { - // Fetch active call's id from view - TPhoneCmdParamCallStateData callStateData; // Find the dialing call - callStateData.SetCallState( EPEStateDialing ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateDialing ); + if( callId > KErrNotFound ) { // Release the call - iStateMachine->SetCallId( - callStateData.CallId() ); + iStateMachine->SetCallId( callId ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease ); } else { - callStateData.SetCallState( EPEStateDisconnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() > KErrNotFound ) + callId = PhoneCallUtil::CallIdByState( EPEStateDisconnecting ); + if ( callId > KErrNotFound ) { // Release the call - iStateMachine->SetCallId( - callStateData.CallId() ); + iStateMachine->SetCallId( callId ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease ); } @@ -294,30 +284,21 @@ case EPhoneInCallCmdEndThisOutgoingCall: { // Fetch call's id from view - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateDialing ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateDialing ); + if ( callId > KErrNotFound ) { // Release the call - iStateMachine->SetCallId( - callStateData.CallId() ); + iStateMachine->SetCallId( callId ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease ); } else { - callStateData.SetCallState( EPEStateDisconnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() > KErrNotFound ) + callId = PhoneCallUtil::CallIdByState( EPEStateDisconnecting ); + if ( callId > KErrNotFound ) { // Release the call - iStateMachine->SetCallId( - callStateData.CallId() ); + iStateMachine->SetCallId( callId ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease ); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -34,9 +34,9 @@ #include "tphonecmdparamstring.h" #include "tphonecmdparamcallheaderdata.h" #include "tphonecmdparamglobalnote.h" -#include "tphonecmdparamcallstatedata.h" #include "phonestatedefinitionsgsm.h" #include "phonelogger.h" +#include "phonecallutil.h" enum TTerminatedCall { @@ -79,11 +79,7 @@ { CPhoneGsmInCall::ConstructL(); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - iWaitingCallId = callStateData.CallId(); + iWaitingCallId = PhoneCallUtil::CallIdByState( EPEStateRinging ); } // ----------------------------------------------------------- @@ -225,44 +221,12 @@ void CPhoneSingleAndCallSetupAndWaiting::HandleIdleL( TInt aCallId ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::HandleIdleL() "); - // Fetch call ids for hold, ringing and alerting bubbles - TInt holdCallId; - TInt ringingCallId; - TInt alertingCallId; - TPhoneViewResponseId heldResponse; - TPhoneViewResponseId ringingResponse; - TPhoneViewResponseId alertingResponse; - TPhoneCmdParamCallStateData callStateData; iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); - - callStateData.SetCallState( EPEStateHeld ); - heldResponse = iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - holdCallId = callStateData.CallId(); - - callStateData.SetCallState( EPEStateRinging ); - ringingResponse = iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - ringingCallId = callStateData.CallId(); - - callStateData.SetCallState( EPEStateConnecting ); - alertingResponse = iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - alertingCallId = callStateData.CallId(); - - if( heldResponse != EPhoneViewResponseSuccess || - ringingResponse != EPhoneViewResponseSuccess || - alertingResponse != EPhoneViewResponseSuccess ) - { - // Some or all call id fetches were unsuccesfull. - // Terminate all connections and return to idle state. - // TBD: Kill all bubbles here - iStateMachine->SendPhoneEngineMessage( - MPEPhoneModel::EPEMessageTerminateAllConnections ); - CPhoneGsmInCall::HandleIdleL( aCallId ); - return; - } + + TInt holdCallId = PhoneCallUtil::CallIdByState( EPEStateHeld ); + TInt ringingCallId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + TInt alertingCallId = PhoneCallUtil::CallIdByState( EPEStateConnecting ); // Find out which call was terminated TTerminatedCall terminatedCall = ENull; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -37,12 +37,12 @@ #include "tphonecmdparamstring.h" #include "tphonecmdparamcallheaderdata.h" #include "tphonecmdparamglobalnote.h" -#include "tphonecmdparamcallstatedata.h" #include "phonestatedefinitionsgsm.h" #include "phonelogger.h" #include "cphonecenrepproxy.h" #include "cphonepubsubproxy.h" #include "mphonestorage.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -73,19 +73,13 @@ void CPhoneSingleAndWaiting::ConstructL() { CPhoneGsmInCall::ConstructL(); - - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if ( callStateData.CallId() == KErrNotFound ) + iSingleCallId = PhoneCallUtil::CallIdByState( EPEStateConnected ); + if ( iSingleCallId == KErrNotFound ) { - callStateData.SetCallState( EPEStateHeld ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); + iSingleCallId = PhoneCallUtil::CallIdByState( EPEStateHeld ); } - iSingleCallId = callStateData.CallId(); + __PHONELOG1( EBasic, EPhoneUIStates, "CPhoneSingleAndWaiting::ConstructL() (iSingleCallId=%d)", iSingleCallId); } @@ -179,12 +173,8 @@ case EPhoneCallComingCmdReject: // fall through { - // Get waiting callid - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); - iStateMachine->SetCallId( callStateData.CallId() ); + iStateMachine->SetCallId( + PhoneCallUtil::CallIdByState( EPEStateRinging ) ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageReject ); break; @@ -252,25 +242,15 @@ if ( iSingleCallId == KErrNotFound ) { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateDisconnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() == KErrNotFound ) + iSingleCallId = PhoneCallUtil::CallIdByState( EPEStateDisconnecting ); + if ( iSingleCallId == KErrNotFound ) { - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() == KErrNotFound ) + iSingleCallId = PhoneCallUtil::CallIdByState( EPEStateConnected ); + if ( iSingleCallId == KErrNotFound ) { - callStateData.SetCallState( EPEStateHeld ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); + iSingleCallId = PhoneCallUtil::CallIdByState( EPEStateHeld ); } } - iSingleCallId = callStateData.CallId(); } __PHONELOG1( EBasic, EPhoneControl, @@ -287,26 +267,23 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); // Get waiting callId - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, - &callStateData ); + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); __PHONELOG1( EBasic, EPhoneControl, "CPhoneSingleAndWaiting::HandleIdleL EPEStateRinging CallId(%d)", - callStateData.CallId() ); + callId ); // Display ringing bubble - if ( callStateData.CallId() > KErrNotFound ) - { - UpdateCallHeaderAndUiCommandsL( callStateData.CallId() ); + if ( callId > KErrNotFound ) + { + SetRingingTonePlaybackL( callId ); + UpdateCallHeaderAndUiCommandsL( callId ); if ( iNumberEntryManager->IsNumberEntryVisibleL() ) { iNumberEntryManager->SetNumberEntryVisibilityL(EFalse); } - SetRingingTonePlaybackL( callStateData.CallId() ); BringIncomingToForegroundL(); } SetBackButtonActive(EFalse); @@ -324,6 +301,11 @@ iNumberEntryManager->SetNumberEntryVisibilityL(ETrue); } + if ( PhoneCallUtil::IsVideoCall( iSingleCallId ) ) + { + iViewCommandHandle->ExecuteCommand( EPhoneViewSetVideoCallOnTop ); + } + UpdateUiCommands(); EndUiUpdate(); iStateMachine->ChangeState( EPhoneStateSingle ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonesinglecall.cpp --- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -41,13 +41,13 @@ #include "phonerssbase.h" #include "phonestatedefinitionsgsm.h" #include "tphonecmdparamglobalnote.h" -#include "tphonecmdparamcallstatedata.h" #include "phonelogger.h" #include "cphonepubsubproxy.h" #include "cphonemediatorfactory.h" #include "cphonemediatorsender.h" #include "mphonestorage.h" #include "cphonecenrepproxy.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -83,28 +83,19 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, &globalNotifierParam ); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnected ); // No connected call, - if( callStateData.CallId() == KErrNotFound ) + if( callId == KErrNotFound ) { //find the held call. - callStateData.SetCallState( EPEStateHeld ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - // No held call. - if ( callStateData.CallId() == KErrNotFound ) + callId = PhoneCallUtil::CallIdByState( EPEStateHeld ); + if ( callId == KErrNotFound ) { // find the disconnected call. - callStateData.SetCallState( EPEStateDisconnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); + callId = PhoneCallUtil::CallIdByState( EPEStateDisconnecting ); } } - iCallId = callStateData.CallId(); + iCallId = callId; } // ----------------------------------------------------------- diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonetwosingles.cpp --- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -36,7 +36,6 @@ #include "tphonecmdparamboolean.h" #include "tphonecmdparamstring.h" #include "tphonecmdparamcallheaderdata.h" -#include "tphonecmdparamcallstatedata.h" #include "phonestatedefinitionsgsm.h" #include "phonelogger.h" diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -29,7 +29,6 @@ #include "tphonecmdparamcallheaderdata.h" #include "tphonecmdparamglobalnote.h" #include "tphonecmdparamstring.h" -#include "tphonecmdparamcallstatedata.h" #include "phoneviewcommanddefinitions.h" #include "phoneui.hrh" #include "cphonemainresourceresolver.h" @@ -37,6 +36,7 @@ #include "phonestatedefinitionsgsm.h" #include "phonelogger.h" #include "mphonestorage.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -71,11 +71,7 @@ { CPhoneTwoSingles::ConstructL(); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - iRingingCallId = callStateData.CallId(); + iRingingCallId = PhoneCallUtil::CallIdByState( EPEStateRinging ); } // ----------------------------------------------------------- diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/common/cphonestateincallstub.cpp --- a/phoneapp/phoneuistates/tsrc/common/cphonestateincallstub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/common/cphonestateincallstub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -79,17 +79,6 @@ } -TBool CPhoneStateInCall::GetRingingCallL( ) - { - - } - -TBool CPhoneStateInCall::IsVideoCallRingingL() - { - - } - - void CPhoneStateInCall::DisconnectOutgoingCallL() { diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/common/cphonestatestub.cpp --- a/phoneapp/phoneuistates/tsrc/common/cphonestatestub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/common/cphonestatestub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -326,10 +326,10 @@ // <-------------------------- COMMON STATE FUNCTIONS ------------------------> // ----------------------------------------------------------- -// CPhoneState::DialMultimediaCallL +// CPhoneState::DialMultimediaCall // ----------------------------------------------------------- // -void CPhoneState::DialMultimediaCallL() +void CPhoneState::DialMultimediaCall() { } @@ -630,15 +630,6 @@ } -// ----------------------------------------------------------- -// CPhoneState::IsWaitingCallL -// ----------------------------------------------------------- -// -TBool CPhoneState::IsWaitingCallL( const TInt /*aCallId*/ ) - { - - } - // --------------------------------------------------------- // CPhoneState::HandleDtmfKeyToneL // --------------------------------------------------------- diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphconfandwaitingandcallsetup/group/ut_cphconfandwaitingandcallsetup.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphconfandwaitingandcallsetup/group/ut_cphconfandwaitingandcallsetup.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphconfandwaitingandcallsetup/group/ut_cphconfandwaitingandcallsetup.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -32,6 +32,7 @@ SOURCE mock_cphonestate.cpp SOURCE mock_cphonestateincall.cpp SOURCE mock_cphonestatemachine.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp @@ -103,4 +104,7 @@ LIBRARY apgrfx.lib LIBRARY gdi.lib // TZoomFactor LIBRARY ws32.lib // RWsSession -LIBRARY bafl.lib // Descriptor arrays \ No newline at end of file +LIBRARY bafl.lib // Descriptor arrays + +SMPSAFE + diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonealerting/group/ut_cphonealerting.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonealerting/group/ut_cphonealerting.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonealerting/group/ut_cphonealerting.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -35,6 +35,7 @@ SOURCE mock_cphonestateincall.cpp SOURCE mock_cphonestatemachine.cpp SOURCE mock_cphonestateidle.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp @@ -103,3 +104,5 @@ LIBRARY ws32.lib // RWsSession LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonecallsetup/group/ut_cphonecallsetup.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonecallsetup/group/ut_cphonecallsetup.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonecallsetup/group/ut_cphonecallsetup.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -68,4 +68,6 @@ LIBRARY avkon.lib // AknTextUtils LIBRARY CommonEngine.lib //StringLoader LIBRARY cone.lib -LIBRARY apgrfx.lib \ No newline at end of file +LIBRARY apgrfx.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonecallsetupandwaiting/group/ut_cphonecallsetupandwaiting.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonecallsetupandwaiting/group/ut_cphonecallsetupandwaiting.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonecallsetupandwaiting/group/ut_cphonecallsetupandwaiting.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -39,6 +39,9 @@ SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_phonecallutil.cpp + SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_tphonetouchbuttonconfig.cpp @@ -76,4 +79,4 @@ LIBRARY efsrv.lib LIBRARY phoneuiutils.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneconference/group/ut_cphoneconference.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneconference/group/ut_cphoneconference.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconference/group/ut_cphoneconference.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -37,6 +37,7 @@ SOURCEPATH ../../../../internal/mocks/phoneuicontrol SOURCE mock_cphonestate.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_tphonetouchbuttonconfig.cpp @@ -79,4 +80,4 @@ LIBRARY efsrv.lib LIBRARY phoneuiutils.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandcallsetup/group/ut_cphoneconferenceandcallsetup.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandcallsetup/group/ut_cphoneconferenceandcallsetup.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandcallsetup/group/ut_cphoneconferenceandcallsetup.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -37,6 +37,7 @@ SOURCEPATH ../../../../internal/mocks/phoneuicontrol SOURCE mock_cphonestate.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_tphonetouchbuttonconfig.cpp @@ -78,4 +79,4 @@ LIBRARY efsrv.lib LIBRARY phoneuiutils.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingle/group/ut_cphoneconferenceandsingle.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingle/group/ut_cphoneconferenceandsingle.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingle/group/ut_cphoneconferenceandsingle.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -37,6 +37,7 @@ SOURCEPATH ../../../../internal/mocks/phoneuicontrol SOURCE mock_cphonestate.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_tphonetouchbuttonconfig.cpp @@ -80,4 +81,4 @@ LIBRARY efsrv.lib LIBRARY phoneuiutils.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingleandwaiting/group/ut_cphoneconferenceandsingleandwaiting.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingleandwaiting/group/ut_cphoneconferenceandsingleandwaiting.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingleandwaiting/group/ut_cphoneconferenceandsingleandwaiting.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -37,6 +37,7 @@ SOURCEPATH ../../../../internal/mocks/phoneuicontrol SOURCE mock_cphonestate.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_tphonetouchbuttonconfig.cpp @@ -82,4 +83,4 @@ LIBRARY efsrv.lib LIBRARY phoneuiutils.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -98,11 +98,12 @@ iViewCmdHandleMock = new CPhoneViewCommandHandleMock(); iStateMachineMock = CPhoneStateMachineGSM::NewL( iViewCmdHandleMock ); - iMockContext->ExpectCallL( "TPhoneCmdParamCallStateData::CallId" ). + iMockContext->ExpectCallL( "PhoneCallUtil::CallIdByState" ). ReturnsL( 2 ); iStateConferenceAndWaiting = CPhoneConferenceAndWaiting::NewL( iStateMachineMock, iViewCmdHandleMock, NULL ); + iMockContext->Reset(); } void ut_cphoneconferenceandwaiting::Setup_NoRingingCallIdL( ) @@ -115,10 +116,11 @@ iViewCmdHandleMock = new CPhoneViewCommandHandleMock(); iStateMachineMock = CPhoneStateMachineGSM::NewL( iViewCmdHandleMock ); - iMockContext->ExpectCallL( "TPhoneCmdParamCallStateData::CallId" ). + iMockContext->ExpectCallL( "PhoneCallUtil::CallIdByState" ). ReturnsL( -1 ); iStateConferenceAndWaiting = CPhoneConferenceAndWaiting::NewL( iStateMachineMock, iViewCmdHandleMock, NULL ); + iMockContext->Reset(); } diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/group/ut_cphoneconferenceandwaiting.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/group/ut_cphoneconferenceandwaiting.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/group/ut_cphoneconferenceandwaiting.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -30,6 +30,7 @@ SOURCE mock_CPhoneState.cpp SOURCE mock_cphonestateincall.cpp SOURCE mock_cphonestatemachine.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp @@ -103,3 +104,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneemergency/group/ut_cphoneemergency.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneemergency/group/ut_cphoneemergency.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneemergency/group/ut_cphoneemergency.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -102,3 +102,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneerrormessageshandler/group/ut_cphoneerrormessageshandler.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneerrormessageshandler/group/ut_cphoneerrormessageshandler.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneerrormessageshandler/group/ut_cphoneerrormessageshandler.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -98,3 +98,5 @@ LIBRARY RemConCoreApi.lib LIBRARY efsrv.lib LIBRARY gdi.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonegeneralgsmmessageshandler/group/ut_cphonegeneralgsmmessageshandler.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonegeneralgsmmessageshandler/group/ut_cphonegeneralgsmmessageshandler.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonegeneralgsmmessageshandler/group/ut_cphonegeneralgsmmessageshandler.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -106,3 +106,5 @@ LIBRARY RemConCoreApi.lib LIBRARY efsrv.lib LIBRARY gdi.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneidle/group/ut_cphoneidle.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneidle/group/ut_cphoneidle.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneidle/group/ut_cphoneidle.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -86,4 +86,4 @@ LIBRARY symbianmock.lib LIBRARY efsrv.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneincoming/Src/ut_cphoneincoming.cpp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneincoming/Src/ut_cphoneincoming.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneincoming/Src/ut_cphoneincoming.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -161,7 +161,7 @@ // void ut_cphoneincoming::T_HandleWaiting() { - iMockContext->ExpectCallL( "TPhoneCmdParamCallStateData::CallId" ). + iMockContext->ExpectCallL( "PhoneCallUtil::CallIdByState" ). ReturnsL( 1 ); iMockContext->ExpectCallL( "CPhoneStateMachine::ChangeState" ). WithL( EPhoneStateWaitingInSingle ); diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphoneincoming/group/ut_cphoneincoming.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphoneincoming/group/ut_cphoneincoming.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphoneincoming/group/ut_cphoneincoming.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -31,6 +31,7 @@ SOURCE mock_cphonestateincall.cpp SOURCE mock_cphonestatemachine.cpp SOURCE mock_CPhoneStateIncoming.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp @@ -109,5 +110,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler - - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonesingleandalerting/group/ut_cphonesingleandalerting.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonesingleandalerting/group/ut_cphonesingleandalerting.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonesingleandalerting/group/ut_cphonesingleandalerting.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -45,6 +45,8 @@ SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_phonecallutil.cpp // Sources required by the test suite SOURCEPATH ../src @@ -73,5 +75,4 @@ LIBRARY cone.lib LIBRARY symbianmock.lib - - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonesingleandwaiting/group/ut_cphonesingleandwaiting.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonesingleandwaiting/group/ut_cphonesingleandwaiting.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonesingleandwaiting/group/ut_cphonesingleandwaiting.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -36,6 +36,7 @@ SOURCE mock_cphonestate.cpp SOURCE mock_cphonestateincall.cpp SOURCE mock_cphonestatemachine.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp @@ -103,4 +104,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonesinglecall/group/ut_cphonesinglecall.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonesinglecall/group/ut_cphonesinglecall.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonesinglecall/group/ut_cphonesinglecall.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -33,6 +33,7 @@ SOURCE mock_cphonestateincall.cpp SOURCE mock_cphonestatemachine.cpp SOURCE mock_cphonedtmfwaitchartimer.cpp +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp @@ -109,5 +110,4 @@ LIBRARY gdi.lib // TZoomFactor LIBRARY bafl.lib // CBaActiveScheduler - - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonetwosingles/group/ut_cphonetwosingles.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonetwosingles/group/ut_cphonetwosingles.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonetwosingles/group/ut_cphonetwosingles.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -37,6 +37,9 @@ SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_phonecallutil.cpp + SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_tphonetouchbuttonconfig.cpp @@ -77,4 +80,4 @@ LIBRARY symbianmock.lib LIBRARY efsrv.lib - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/Src/ut_cphonetwosinglesandwaiting.cpp --- a/phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/Src/ut_cphonetwosinglesandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/Src/ut_cphonetwosinglesandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -26,6 +26,12 @@ #include "TPhoneCommandParam.h" #include "CPhoneMainResourceResolver.h" #include "phoneappcommands.hrh" +#include +#include +#include +#include +#include +#include #define protected public #include "CPhoneTwoSinglesAndWaiting.h" @@ -49,6 +55,7 @@ ut_cphonetwosinglesandwaiting::~ut_cphonetwosinglesandwaiting() { + CSmcMockContext::Release(); } ut_cphonetwosinglesandwaiting::ut_cphonetwosinglesandwaiting() @@ -58,12 +65,14 @@ void ut_cphonetwosinglesandwaiting::ConstructL() { CEUnitTestSuiteClass::ConstructL(); + iMockContext = CSmcMockContext::InstanceL(); } // - Test methods ----------------------------------------------------------- void ut_cphonetwosinglesandwaiting::SetupL( ) { + iMockContext->InitializeL(); iViewCommandHandle = CPhoneViewController::NewL(); iStateMachine = CPhoneStateMachineStub::NewL(); @@ -79,6 +88,7 @@ delete iStateTwoSinglesAndWaiting; delete iViewCommandHandle; delete iStateMachine; + iMockContext->Reset(); } // ----------------------------------------------------------------------------- diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/Src/ut_cphonetwosinglesandwaiting.h --- a/phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/Src/ut_cphonetwosinglesandwaiting.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/Src/ut_cphonetwosinglesandwaiting.h Fri Oct 15 12:58:46 2010 +0300 @@ -28,6 +28,7 @@ class CPhoneTwoSinglesAndWaiting; class CPhoneStateMachineStub; class CPhoneViewController; +class CSmcMockContext; // CLASS DEFINITION /** @@ -63,6 +64,7 @@ CPhoneTwoSinglesAndWaiting * iStateTwoSinglesAndWaiting; + CSmcMockContext* iMockContext; EUNIT_DECLARE_TEST_TABLE; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/group/ut_cphonetwosinglesandwaiting.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/group/ut_cphonetwosinglesandwaiting.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphonetwosinglesandwaiting/group/ut_cphonetwosinglesandwaiting.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -35,6 +35,9 @@ SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol SOURCE mock_cphonenumberentrymanager.cpp +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_phonecallutil.cpp + SOURCEPATH ../../../../internal/mocks/phoneuiutils SOURCE mock_tphonetouchbuttonconfig.cpp @@ -75,5 +78,4 @@ LIBRARY symbianmock.lib LIBRARY efsrv.lib - - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/Src/ut_cphsingleandcallsetupandwait.cpp --- a/phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/Src/ut_cphsingleandcallsetupandwait.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/Src/ut_cphsingleandcallsetupandwait.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -27,6 +27,12 @@ #include "TPhoneCommandParam.h" #include "CPhoneMainResourceResolver.h" #include "phoneappcommands.hrh" +#include +#include +#include +#include +#include +#include // - Construction ----------------------------------------------------------- @@ -48,6 +54,7 @@ ut_cphsingleandcallsetupandwait::~ut_cphsingleandcallsetupandwait() { + CSmcMockContext::Release(); } ut_cphsingleandcallsetupandwait::ut_cphsingleandcallsetupandwait() @@ -57,6 +64,7 @@ void ut_cphsingleandcallsetupandwait::ConstructL() { CEUnitTestSuiteClass::ConstructL(); + iMockContext = CSmcMockContext::InstanceL(); } // - Test methods ----------------------------------------------------------- @@ -65,6 +73,7 @@ void ut_cphsingleandcallsetupandwait::SetupL( ) { + iMockContext->InitializeL(); iViewCommandHandle = CPhoneViewController::NewL(); iStateMachine = CPhoneStateMachineStub::NewL(); @@ -80,6 +89,7 @@ delete iStateSingleAndCallSetupAndWaiting; delete iViewCommandHandle; delete iStateMachine; + iMockContext->Reset(); } // ----------------------------------------------------------------------------- diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/Src/ut_cphsingleandcallsetupandwait.h --- a/phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/Src/ut_cphsingleandcallsetupandwait.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/Src/ut_cphsingleandcallsetupandwait.h Fri Oct 15 12:58:46 2010 +0300 @@ -28,6 +28,7 @@ class CPhoneSingleAndCallSetupAndWaiting; class CPhoneStateMachineStub; class CPhoneViewController; +class CSmcMockContext; // CLASS DEFINITION /** @@ -65,6 +66,7 @@ CPhoneSingleAndCallSetupAndWaiting * iStateSingleAndCallSetupAndWaiting; + CSmcMockContext* iMockContext; EUNIT_DECLARE_TEST_TABLE; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/group/ut_cphsingleandcallsetupandwait.mmp --- a/phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/group/ut_cphsingleandcallsetupandwait.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/tsrc/ut_cphsingleandcallsetupandwait/group/ut_cphsingleandcallsetupandwait.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -37,7 +37,10 @@ SOURCE mock_tphonetouchbuttonconfig.cpp SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol -SOURCE mock_cphonenumberentrymanager.cpp +SOURCE mock_cphonenumberentrymanager.cpp + +SOURCEPATH ../../../../internal/mocks/phoneuicontrol +SOURCE mock_phonecallutil.cpp SOURCEPATH ../../../../phoneuistates/src SOURCE CPhoneSingleAndCallSetupAndWaiting.cpp @@ -74,5 +77,4 @@ LIBRARY cone.lib LIBRARY SymbianMock.lib - - +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h --- a/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h Fri Oct 15 12:58:46 2010 +0300 @@ -218,6 +218,10 @@ EPhoneViewSetBlueToothFlag, /** EPhoneViewSetBluetoothAvailableFlag */ EPhoneViewSetBluetoothAvailableFlag, + /** EPhoneViewSetVideoCallOnTop */ + EPhoneViewSetVideoCallOnTop, + /** EPhoneViewSetRingingFlag */ + EPhoneViewSetRingingFlag, /** , // Don't remove this, this should always be the last in list. */ EPhoneAmountOfCommands }; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp --- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -118,7 +118,9 @@ _STLIT8(K92, "EPhoneViewLaunchLogs"); _STLIT8(K93, "EPhoneViewSetBlueToothFlag"); _STLIT8(K94, "EPhoneViewSetBluetoothAvailableFlag"); -_STLIT8(K95, ", // Don't remove this, this should always be the last in list."); +_STLIT8(K95, "EPhoneViewSetVideoCallOnTop"); +_STLIT8(K96, "EPhoneViewSetRingingFlag"); +_STLIT8(K97, ", // Don't remove this, this should always be the last in list."); // Intermediate const void * const KStringPointers[] = @@ -217,8 +219,10 @@ (const void*)&K92, (const void*)&K93, (const void*)&K94, - (const void*)&K95 + (const void*)&K95, + (const void*)&K96, + (const void*)&K97 }; -const TStringTable PhoneLoggerviewCommands::Table = {95, KStringPointers, EFalse}; +const TStringTable PhoneLoggerviewCommands::Table = {97, KStringPointers, EFalse}; diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiutils/src/phoneloggerviewcommands.st --- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st Fri Oct 15 12:58:46 2010 +0300 @@ -94,4 +94,6 @@ EPhoneViewLaunchLogs EPhoneViewLaunchLogs EPhoneViewSetBlueToothFlag EPhoneViewSetBlueToothFlag EPhoneViewSetBluetoothAvailableFlag EPhoneViewSetBluetoothAvailableFlag +EPhoneViewSetVideoCallOnTop EPhoneViewSetVideoCallOnTop +EPhoneViewSetRingingFlag EPhoneViewSetRingingFlag EPhoneAmountOfCommands, // Don't remove this, this should always be the last in list. diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiutils/tsrc/ut_cphoneresourceresolverbase/group/ut_cphoneresourceresolverbase.mmp --- a/phoneapp/phoneuiutils/tsrc/ut_cphoneresourceresolverbase/group/ut_cphoneresourceresolverbase.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiutils/tsrc/ut_cphoneresourceresolverbase/group/ut_cphoneresourceresolverbase.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -95,4 +95,5 @@ LIBRARY CentralRepository.lib +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamcallheaderdata/group/ut_tphonecmdparamcallheaderdata.mmp --- a/phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamcallheaderdata/group/ut_tphonecmdparamcallheaderdata.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamcallheaderdata/group/ut_tphonecmdparamcallheaderdata.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -57,3 +57,5 @@ LIBRARY euser.lib // Libraries required by the tested code + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamglobalnote/group/ut_tphonecmdparamglobalnote.mmp --- a/phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamglobalnote/group/ut_tphonecmdparamglobalnote.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamglobalnote/group/ut_tphonecmdparamglobalnote.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -52,3 +52,5 @@ LIBRARY EUnit.lib LIBRARY EUnitUtil.lib LIBRARY euser.lib + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamquery/group/ut_tphonecmdparamquery.mmp --- a/phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamquery/group/ut_tphonecmdparamquery.mmp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiutils/tsrc/ut_tphonecmdparamquery/group/ut_tphonecmdparamquery.mmp Fri Oct 15 12:58:46 2010 +0300 @@ -56,3 +56,5 @@ LIBRARY euser.lib // Libraries required by the tested code + +SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def --- a/phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def Fri Oct 15 12:58:46 2010 +0300 @@ -1,70 +1,48 @@ EXPORTS ?setExpandAction@PhoneUIQtView@@UAEXHH@Z @ 1 NONAME ; void PhoneUIQtView::setExpandAction(int, int) ?keyPressed@PhoneUIQtView@@IAEXPAVQKeyEvent@@@Z @ 2 NONAME ; void PhoneUIQtView::keyPressed(class QKeyEvent *) - ?volumeSliderChanged@PhoneUIQtView@@QAEXH@Z @ 3 NONAME ; void PhoneUIQtView::volumeSliderChanged(int) - ?menuReference@PhoneUIQtView@@UAEAAVHbMenu@@XZ @ 4 NONAME ; class HbMenu & PhoneUIQtView::menuReference(void) + ?menuReference@PhoneUIQtView@@UAEAAVHbMenu@@XZ @ 3 NONAME ; class HbMenu & PhoneUIQtView::menuReference(void) + ?windowActivated@PhoneUIQtView@@IAEXXZ @ 4 NONAME ; void PhoneUIQtView::windowActivated(void) ?qt_metacast@PhoneUIQtView@@UAEPAXPBD@Z @ 5 NONAME ; void * PhoneUIQtView::qt_metacast(char const *) - ?clearParticipantListActions@PhoneUIQtView@@UAEXXZ @ 6 NONAME ; void PhoneUIQtView::clearParticipantListActions(void) - ?icon@PhoneAction@@QBE?AVHbIcon@@XZ @ 7 NONAME ; class HbIcon PhoneAction::icon(void) const - ?setBackButtonVisible@PhoneUIQtView@@UAEX_N@Z @ 8 NONAME ; void PhoneUIQtView::setBackButtonVisible(bool) - ?addBubbleCommand@PhoneUIQtView@@UAEXHABVPhoneAction@@@Z @ 9 NONAME ; void PhoneUIQtView::addBubbleCommand(int, class PhoneAction const &) - ?shutdownPhoneApp@PhoneUIQtView@@UAEXXZ @ 10 NONAME ; void PhoneUIQtView::shutdownPhoneApp(void) - ?showToolbar@PhoneUIQtView@@UAEXXZ @ 11 NONAME ; void PhoneUIQtView::showToolbar(void) - ?clearBubbleCommands@PhoneUIQtView@@UAEXH@Z @ 12 NONAME ; void PhoneUIQtView::clearBubbleCommands(int) - ?eventFilter@PhoneUIQtView@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 13 NONAME ; bool PhoneUIQtView::eventFilter(class QObject *, class QEvent *) - ??0PhoneUIQtView@@QAE@AAVHbMainWindow@@PAVQGraphicsItem@@@Z @ 14 NONAME ; PhoneUIQtView::PhoneUIQtView(class HbMainWindow &, class QGraphicsItem *) - ?metaObject@PhoneUIQtView@@UBEPBUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const * PhoneUIQtView::metaObject(void) const - ??1PhoneAction@@QAE@XZ @ 16 NONAME ; PhoneAction::~PhoneAction(void) - ?staticMetaObject@PhoneUIQtView@@2UQMetaObject@@B @ 17 NONAME ; struct QMetaObject const PhoneUIQtView::staticMetaObject - ?setText@PhoneAction@@QAEXVQString@@@Z @ 18 NONAME ; void PhoneAction::setText(class QString) - ?setDisabled@PhoneAction@@QAEX_N@Z @ 19 NONAME ; void PhoneAction::setDisabled(bool) - ?setCommand@PhoneAction@@QAEXH@Z @ 20 NONAME ; void PhoneAction::setCommand(int) - ??1PhoneUIQtView@@UAE@XZ @ 21 NONAME ; PhoneUIQtView::~PhoneUIQtView(void) + ?setMenuActions@PhoneUIQtView@@UAEXABV?$QList@PAVHbAction@@@@@Z @ 6 NONAME ; void PhoneUIQtView::setMenuActions(class QList const &) + ?clearParticipantListActions@PhoneUIQtView@@UAEXXZ @ 7 NONAME ; void PhoneUIQtView::clearParticipantListActions(void) + ?setToolbarActions@PhoneUIQtView@@UAEXABV?$QList@PAVHbAction@@@@@Z @ 8 NONAME ; void PhoneUIQtView::setToolbarActions(class QList const &) + ?setBackButtonVisible@PhoneUIQtView@@UAEX_N@Z @ 9 NONAME ; void PhoneUIQtView::setBackButtonVisible(bool) + ?addBubbleCommand@PhoneUIQtView@@UAEXHPAVHbAction@@@Z @ 10 NONAME ; void PhoneUIQtView::addBubbleCommand(int, class HbAction *) + ?setRestrictedMode@PhoneUIQtView@@UAEX_N@Z @ 11 NONAME ; void PhoneUIQtView::setRestrictedMode(bool) + ?showToolbar@PhoneUIQtView@@UAEXXZ @ 12 NONAME ; void PhoneUIQtView::showToolbar(void) + ?hide@PhoneUIQtView@@UAEXXZ @ 13 NONAME ; void PhoneUIQtView::hide(void) + ?clearBubbleCommands@PhoneUIQtView@@UAEXH@Z @ 14 NONAME ; void PhoneUIQtView::clearBubbleCommands(int) + ??0PhoneUIQtView@@QAE@AAVHbMainWindow@@PAVQGraphicsItem@@@Z @ 15 NONAME ; PhoneUIQtView::PhoneUIQtView(class HbMainWindow &, class QGraphicsItem *) + ?clearDialpad@PhoneUIQtView@@UAEXXZ @ 16 NONAME ; void PhoneUIQtView::clearDialpad(void) + ?metaObject@PhoneUIQtView@@UBEPBUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const * PhoneUIQtView::metaObject(void) const + ?captureKey@PhoneUIQtView@@UAEXW4Key@Qt@@_N@Z @ 18 NONAME ; void PhoneUIQtView::captureKey(enum Qt::Key, bool) + ?staticMetaObject@PhoneUIQtView@@2UQMetaObject@@B @ 19 NONAME ; struct QMetaObject const PhoneUIQtView::staticMetaObject + ??1PhoneUIQtView@@UAE@XZ @ 20 NONAME ; PhoneUIQtView::~PhoneUIQtView(void) + ?windowDeactivated@PhoneUIQtView@@IAEXXZ @ 21 NONAME ; void PhoneUIQtView::windowDeactivated(void) ?tr@PhoneUIQtView@@SA?AVQString@@PBD0@Z @ 22 NONAME ; class QString PhoneUIQtView::tr(char const *, char const *) - ?onEditorContentChanged@PhoneUIQtView@@QAEXXZ @ 23 NONAME ; void PhoneUIQtView::onEditorContentChanged(void) - ?hideDialpad@PhoneUIQtView@@UAEXXZ @ 24 NONAME ; void PhoneUIQtView::hideDialpad(void) - ?bringToForeground@PhoneUIQtView@@UAEXXZ @ 25 NONAME ; void PhoneUIQtView::bringToForeground(void) - ?volumeSliderValue@PhoneUIQtView@@UAEHXZ @ 26 NONAME ; int PhoneUIQtView::volumeSliderValue(void) - ?setToolbarActions@PhoneUIQtView@@UAEXABV?$QList@PAVPhoneAction@@@@@Z @ 27 NONAME ; void PhoneUIQtView::setToolbarActions(class QList const &) - ?text@PhoneAction@@QBE?AVQString@@XZ @ 28 NONAME ; class QString PhoneAction::text(void) const - ??_EPhoneUIQtView@@UAE@I@Z @ 29 NONAME ; PhoneUIQtView::~PhoneUIQtView(unsigned int) - ?setMenuActions@PhoneUIQtView@@UAEXABV?$QList@PAVPhoneAction@@@@@Z @ 30 NONAME ; void PhoneUIQtView::setMenuActions(class QList const &) - ?trUtf8@PhoneUIQtView@@SA?AVQString@@PBD0H@Z @ 31 NONAME ; class QString PhoneUIQtView::trUtf8(char const *, char const *, int) - ?isDialpadVisible@PhoneUIQtView@@UAE_NXZ @ 32 NONAME ; bool PhoneUIQtView::isDialpadVisible(void) - ?bubbleManager@PhoneUIQtView@@UAEAAVBubbleManagerIF@@XZ @ 33 NONAME ; class BubbleManagerIF & PhoneUIQtView::bubbleManager(void) - ?command@PhoneUIQtView@@IAEXH@Z @ 34 NONAME ; void PhoneUIQtView::command(int) - ?dialpadText@PhoneUIQtView@@UAE?AVQString@@XZ @ 35 NONAME ; class QString PhoneUIQtView::dialpadText(void) - ?backButtonClicked@PhoneUIQtView@@QAEXXZ @ 36 NONAME ; void PhoneUIQtView::backButtonClicked(void) - ?dialpadIsAboutToClose@PhoneUIQtView@@IAEXXZ @ 37 NONAME ; void PhoneUIQtView::dialpadIsAboutToClose(void) - ?trUtf8@PhoneUIQtView@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString PhoneUIQtView::trUtf8(char const *, char const *) - ?tr@PhoneUIQtView@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString PhoneUIQtView::tr(char const *, char const *, int) - ?createToolBarActions@PhoneUIQtView@@AAEXXZ @ 40 NONAME ; void PhoneUIQtView::createToolBarActions(void) - ?addParticipantListAction@PhoneUIQtView@@UAEXHABVQString@@ABVHbIcon@@@Z @ 41 NONAME ; void PhoneUIQtView::addParticipantListAction(int, class QString const &, class HbIcon const &) - ?actionRole@PhoneAction@@QBE?AW4ActionRole@1@XZ @ 42 NONAME ; enum PhoneAction::ActionRole PhoneAction::actionRole(void) const - ?setDialpadPosition@PhoneUIQtView@@AAEXXZ @ 43 NONAME ; void PhoneUIQtView::setDialpadPosition(void) - ?setActionRole@PhoneUIQtView@@CAXABVPhoneAction@@AAVHbAction@@@Z @ 44 NONAME ; void PhoneUIQtView::setActionRole(class PhoneAction const &, class HbAction &) - ?command@PhoneAction@@QBEHXZ @ 45 NONAME ; int PhoneAction::command(void) const - ?hideToolbar@PhoneUIQtView@@UAEXXZ @ 46 NONAME ; void PhoneUIQtView::hideToolbar(void) - ?qt_metacall@PhoneUIQtView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 47 NONAME ; int PhoneUIQtView::qt_metacall(enum QMetaObject::Call, int, void * *) - ?setActionRole@PhoneAction@@QAEXW4ActionRole@1@@Z @ 48 NONAME ; void PhoneAction::setActionRole(enum PhoneAction::ActionRole) - ?dialpadClosed@PhoneUIQtView@@QAEXXZ @ 49 NONAME ; void PhoneUIQtView::dialpadClosed(void) - ?removeExpandAction@PhoneUIQtView@@UAEXH@Z @ 50 NONAME ; void PhoneUIQtView::removeExpandAction(int) - ?showDialpad@PhoneUIQtView@@UAEXXZ @ 51 NONAME ; void PhoneUIQtView::showDialpad(void) - ?removeVolumeSlider@PhoneUIQtView@@UAEXXZ @ 52 NONAME ; void PhoneUIQtView::removeVolumeSlider(void) - ?handleOrientationChange@PhoneUIQtView@@QAEXW4Orientation@Qt@@@Z @ 53 NONAME ; void PhoneUIQtView::handleOrientationChange(enum Qt::Orientation) - ?setIcon@PhoneAction@@QAEXVHbIcon@@@Z @ 54 NONAME ; void PhoneAction::setIcon(class HbIcon) - ?volumeSliderClosed@PhoneUIQtView@@QAEXXZ @ 55 NONAME ; void PhoneUIQtView::volumeSliderClosed(void) - ?getStaticMetaObject@PhoneUIQtView@@SAABUQMetaObject@@XZ @ 56 NONAME ; struct QMetaObject const & PhoneUIQtView::getStaticMetaObject(void) - ??0PhoneAction@@QAE@XZ @ 57 NONAME ; PhoneAction::PhoneAction(void) - ?keyReleased@PhoneUIQtView@@IAEXPAVQKeyEvent@@@Z @ 58 NONAME ; void PhoneUIQtView::keyReleased(class QKeyEvent *) - ?setVolumeSliderValue@PhoneUIQtView@@UAEXHHHH@Z @ 59 NONAME ; void PhoneUIQtView::setVolumeSliderValue(int, int, int, int) - ?clearAndHideDialpad@PhoneUIQtView@@UAEXXZ @ 60 NONAME ; void PhoneUIQtView::clearAndHideDialpad(void) - ?isDisabled@PhoneAction@@QBE_NXZ @ 61 NONAME ; bool PhoneAction::isDisabled(void) const - ?networkNameChanged@PhoneUIQtView@@QAEXW4NetworkMode@QSystemNetworkInfo@QtMobility@@ABVQString@@@Z @ 62 NONAME ; void PhoneUIQtView::networkNameChanged(enum QtMobility::QSystemNetworkInfo::NetworkMode, class QString const &) - ?windowDeactivated@PhoneUIQtView@@IAEXXZ @ 63 NONAME ; void PhoneUIQtView::windowDeactivated(void) - ?windowActivated@PhoneUIQtView@@IAEXXZ @ 64 NONAME ; void PhoneUIQtView::windowActivated(void) - ?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) + ?hideDialpad@PhoneUIQtView@@UAEXXZ @ 23 NONAME ; void PhoneUIQtView::hideDialpad(void) + ?bringToForeground@PhoneUIQtView@@UAEXXZ @ 24 NONAME ; void PhoneUIQtView::bringToForeground(void) + ?volumeSliderValue@PhoneUIQtView@@UAEHXZ @ 25 NONAME ; int PhoneUIQtView::volumeSliderValue(void) + ??_EPhoneUIQtView@@UAE@I@Z @ 26 NONAME ; PhoneUIQtView::~PhoneUIQtView(unsigned int) + ?trUtf8@PhoneUIQtView@@SA?AVQString@@PBD0H@Z @ 27 NONAME ; class QString PhoneUIQtView::trUtf8(char const *, char const *, int) + ?isDialpadVisible@PhoneUIQtView@@UAE_NXZ @ 28 NONAME ; bool PhoneUIQtView::isDialpadVisible(void) + ?bubbleManager@PhoneUIQtView@@UAEAAVBubbleManagerIF@@XZ @ 29 NONAME ; class BubbleManagerIF & PhoneUIQtView::bubbleManager(void) + ?command@PhoneUIQtView@@IAEXH@Z @ 30 NONAME ; void PhoneUIQtView::command(int) + ?dialpadText@PhoneUIQtView@@UAE?AVQString@@XZ @ 31 NONAME ; class QString PhoneUIQtView::dialpadText(void) + ?dialpadIsAboutToClose@PhoneUIQtView@@IAEXXZ @ 32 NONAME ; void PhoneUIQtView::dialpadIsAboutToClose(void) + ?trUtf8@PhoneUIQtView@@SA?AVQString@@PBD0@Z @ 33 NONAME ; class QString PhoneUIQtView::trUtf8(char const *, char const *) + ?tr@PhoneUIQtView@@SA?AVQString@@PBD0H@Z @ 34 NONAME ; class QString PhoneUIQtView::tr(char const *, char const *, int) + ?addParticipantListAction@PhoneUIQtView@@UAEXHABVQString@@ABVHbIcon@@@Z @ 35 NONAME ; void PhoneUIQtView::addParticipantListAction(int, class QString const &, class HbIcon const &) + ?hideToolbar@PhoneUIQtView@@UAEXXZ @ 36 NONAME ; void PhoneUIQtView::hideToolbar(void) + ?qt_metacall@PhoneUIQtView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 37 NONAME ; int PhoneUIQtView::qt_metacall(enum QMetaObject::Call, int, void * *) + ?removeExpandAction@PhoneUIQtView@@UAEXH@Z @ 38 NONAME ; void PhoneUIQtView::removeExpandAction(int) + ?showDialpad@PhoneUIQtView@@UAEXXZ @ 39 NONAME ; void PhoneUIQtView::showDialpad(void) + ?handleOrientationChange@PhoneUIQtView@@QAEXW4Orientation@Qt@@@Z @ 40 NONAME ; void PhoneUIQtView::handleOrientationChange(enum Qt::Orientation) + ?getStaticMetaObject@PhoneUIQtView@@SAABUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const & PhoneUIQtView::getStaticMetaObject(void) + ?keyReleased@PhoneUIQtView@@IAEXPAVQKeyEvent@@@Z @ 42 NONAME ; void PhoneUIQtView::keyReleased(class QKeyEvent *) + ?setVolumeSliderValue@PhoneUIQtView@@UAEXHHHH@Z @ 43 NONAME ; void PhoneUIQtView::setVolumeSliderValue(int, int, int, int) + ?clearAndHideDialpad@PhoneUIQtView@@UAEXXZ @ 44 NONAME ; void PhoneUIQtView::clearAndHideDialpad(void) + ?shutdownPhoneApp@PhoneUIQtView@@UAEXXZ @ 45 NONAME ; void PhoneUIQtView::shutdownPhoneApp(void) + ?removeVolumeSlider@PhoneUIQtView@@UAEXXZ @ 46 NONAME ; void PhoneUIQtView::removeVolumeSlider(void) diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def --- a/phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def Fri Oct 15 12:58:46 2010 +0300 @@ -1,102 +1,79 @@ EXPORTS - _ZN11PhoneAction10setCommandEi @ 1 NONAME - _ZN11PhoneAction11setDisabledEb @ 2 NONAME - _ZN11PhoneAction13setActionRoleENS_10ActionRoleE @ 3 NONAME - _ZN11PhoneAction7setIconE6HbIcon @ 4 NONAME - _ZN11PhoneAction7setTextE7QString @ 5 NONAME - _ZN11PhoneActionC1Ev @ 6 NONAME - _ZN11PhoneActionC2Ev @ 7 NONAME - _ZN11PhoneActionD1Ev @ 8 NONAME - _ZN11PhoneActionD2Ev @ 9 NONAME - _ZN13PhoneUIQtView10keyPressedEP9QKeyEvent @ 10 NONAME - _ZN13PhoneUIQtView11dialpadTextEv @ 11 NONAME - _ZN13PhoneUIQtView11eventFilterEP7QObjectP6QEvent @ 12 NONAME - _ZN13PhoneUIQtView11hideDialpadEv @ 13 NONAME - _ZN13PhoneUIQtView11hideToolbarEv @ 14 NONAME - _ZN13PhoneUIQtView11keyReleasedEP9QKeyEvent @ 15 NONAME - _ZN13PhoneUIQtView11qt_metacallEN11QMetaObject4CallEiPPv @ 16 NONAME - _ZN13PhoneUIQtView11qt_metacastEPKc @ 17 NONAME - _ZN13PhoneUIQtView11showDialpadEv @ 18 NONAME - _ZN13PhoneUIQtView11showToolbarEv @ 19 NONAME - _ZN13PhoneUIQtView13bubbleManagerEv @ 20 NONAME - _ZN13PhoneUIQtView13dialpadClosedEv @ 21 NONAME - _ZN13PhoneUIQtView13menuReferenceEv @ 22 NONAME - _ZN13PhoneUIQtView13setActionRoleERK11PhoneActionR8HbAction @ 23 NONAME - _ZN13PhoneUIQtView14setMenuActionsERK5QListIP11PhoneActionE @ 24 NONAME - _ZN13PhoneUIQtView15setExpandActionEii @ 25 NONAME - _ZN13PhoneUIQtView16addBubbleCommandEiRK11PhoneAction @ 26 NONAME - _ZN13PhoneUIQtView16isDialpadVisibleEv @ 27 NONAME - _ZN13PhoneUIQtView16shutdownPhoneAppEv @ 28 NONAME - _ZN13PhoneUIQtView16staticMetaObjectE @ 29 NONAME DATA 16 - _ZN13PhoneUIQtView17backButtonClickedEv @ 30 NONAME - _ZN13PhoneUIQtView17bringToForegroundEv @ 31 NONAME - _ZN13PhoneUIQtView17setToolbarActionsERK5QListIP11PhoneActionE @ 32 NONAME - _ZN13PhoneUIQtView17volumeSliderValueEv @ 33 NONAME - _ZN13PhoneUIQtView18removeExpandActionEi @ 34 NONAME - _ZN13PhoneUIQtView18removeVolumeSliderEv @ 35 NONAME - _ZN13PhoneUIQtView18setDialpadPositionEv @ 36 NONAME - _ZN13PhoneUIQtView18volumeSliderClosedEv @ 37 NONAME - _ZN13PhoneUIQtView19clearAndHideDialpadEv @ 38 NONAME - _ZN13PhoneUIQtView19clearBubbleCommandsEi @ 39 NONAME - _ZN13PhoneUIQtView19getStaticMetaObjectEv @ 40 NONAME - _ZN13PhoneUIQtView19volumeSliderChangedEi @ 41 NONAME - _ZN13PhoneUIQtView20createToolBarActionsEv @ 42 NONAME - _ZN13PhoneUIQtView20setBackButtonVisibleEb @ 43 NONAME - _ZN13PhoneUIQtView20setVolumeSliderValueEiiii @ 44 NONAME - _ZN13PhoneUIQtView21dialpadIsAboutToCloseEv @ 45 NONAME - _ZN13PhoneUIQtView22onEditorContentChangedEv @ 46 NONAME - _ZN13PhoneUIQtView23handleOrientationChangeEN2Qt11OrientationE @ 47 NONAME - _ZN13PhoneUIQtView24addParticipantListActionEiRK7QStringRK6HbIcon @ 48 NONAME - _ZN13PhoneUIQtView27clearParticipantListActionsEv @ 49 NONAME - _ZN13PhoneUIQtView7commandEi @ 50 NONAME - _ZN13PhoneUIQtViewC1ER12HbMainWindowP13QGraphicsItem @ 51 NONAME - _ZN13PhoneUIQtViewC2ER12HbMainWindowP13QGraphicsItem @ 52 NONAME - _ZN13PhoneUIQtViewD0Ev @ 53 NONAME - _ZN13PhoneUIQtViewD1Ev @ 54 NONAME - _ZN13PhoneUIQtViewD2Ev @ 55 NONAME - _ZNK11PhoneAction10actionRoleEv @ 56 NONAME - _ZNK11PhoneAction10isDisabledEv @ 57 NONAME - _ZNK11PhoneAction4iconEv @ 58 NONAME - _ZNK11PhoneAction4textEv @ 59 NONAME - _ZNK11PhoneAction7commandEv @ 60 NONAME - _ZNK13PhoneUIQtView10metaObjectEv @ 61 NONAME - _ZTI13PhoneUIQtView @ 62 NONAME - _ZTV13PhoneUIQtView @ 63 NONAME - _ZThn16_N13PhoneUIQtViewD0Ev @ 64 NONAME - _ZThn16_N13PhoneUIQtViewD1Ev @ 65 NONAME - _ZThn28_N13PhoneUIQtView11dialpadTextEv @ 66 NONAME - _ZThn28_N13PhoneUIQtView11hideDialpadEv @ 67 NONAME - _ZThn28_N13PhoneUIQtView11hideToolbarEv @ 68 NONAME - _ZThn28_N13PhoneUIQtView11showDialpadEv @ 69 NONAME - _ZThn28_N13PhoneUIQtView11showToolbarEv @ 70 NONAME - _ZThn28_N13PhoneUIQtView13bubbleManagerEv @ 71 NONAME - _ZThn28_N13PhoneUIQtView13menuReferenceEv @ 72 NONAME - _ZThn28_N13PhoneUIQtView14setMenuActionsERK5QListIP11PhoneActionE @ 73 NONAME - _ZThn28_N13PhoneUIQtView15setExpandActionEii @ 74 NONAME - _ZThn28_N13PhoneUIQtView16addBubbleCommandEiRK11PhoneAction @ 75 NONAME - _ZThn28_N13PhoneUIQtView16isDialpadVisibleEv @ 76 NONAME - _ZThn28_N13PhoneUIQtView16shutdownPhoneAppEv @ 77 NONAME - _ZThn28_N13PhoneUIQtView17bringToForegroundEv @ 78 NONAME - _ZThn28_N13PhoneUIQtView17setToolbarActionsERK5QListIP11PhoneActionE @ 79 NONAME - _ZThn28_N13PhoneUIQtView17volumeSliderValueEv @ 80 NONAME - _ZThn28_N13PhoneUIQtView18removeExpandActionEi @ 81 NONAME - _ZThn28_N13PhoneUIQtView18removeVolumeSliderEv @ 82 NONAME - _ZThn28_N13PhoneUIQtView19clearAndHideDialpadEv @ 83 NONAME - _ZThn28_N13PhoneUIQtView19clearBubbleCommandsEi @ 84 NONAME - _ZThn28_N13PhoneUIQtView20setBackButtonVisibleEb @ 85 NONAME - _ZThn28_N13PhoneUIQtView20setVolumeSliderValueEiiii @ 86 NONAME - _ZThn28_N13PhoneUIQtView24addParticipantListActionEiRK7QStringRK6HbIcon @ 87 NONAME - _ZThn28_N13PhoneUIQtView27clearParticipantListActionsEv @ 88 NONAME - _ZThn8_N13PhoneUIQtViewD0Ev @ 89 NONAME - _ZThn8_N13PhoneUIQtViewD1Ev @ 90 NONAME - _ZN13PhoneUIQtView18networkNameChangedEN10QtMobility18QSystemNetworkInfo11NetworkModeERK7QString @ 91 NONAME - _ZN13PhoneUIQtView15windowActivatedEv @ 92 NONAME - _ZN13PhoneUIQtView17windowDeactivatedEv @ 93 NONAME - _ZN13PhoneUIQtView12clearDialpadEv @ 94 NONAME - _ZThn28_N13PhoneUIQtView12clearDialpadEv @ 95 NONAME - _ZN13PhoneUIQtView10captureKeyEN2Qt3KeyEb @ 96 NONAME - _ZThn28_N13PhoneUIQtView10captureKeyEN2Qt3KeyEb @ 97 NONAME - _ZN13PhoneUIQtView17setRestrictedModeEb @ 98 NONAME - _ZThn28_N13PhoneUIQtView17setRestrictedModeEb @ 99 NONAME - _ZN13PhoneUIQtView20updateMenuVisibilityEv @ 100 NONAME + _ZN13PhoneUIQtView10captureKeyEN2Qt3KeyEb @ 1 NONAME + _ZN13PhoneUIQtView10keyPressedEP9QKeyEvent @ 2 NONAME + _ZN13PhoneUIQtView11dialpadTextEv @ 3 NONAME + _ZN13PhoneUIQtView11hideDialpadEv @ 4 NONAME + _ZN13PhoneUIQtView11hideToolbarEv @ 5 NONAME + _ZN13PhoneUIQtView11keyReleasedEP9QKeyEvent @ 6 NONAME + _ZN13PhoneUIQtView11qt_metacallEN11QMetaObject4CallEiPPv @ 7 NONAME + _ZN13PhoneUIQtView11qt_metacastEPKc @ 8 NONAME + _ZN13PhoneUIQtView11showDialpadEv @ 9 NONAME + _ZN13PhoneUIQtView11showToolbarEv @ 10 NONAME + _ZN13PhoneUIQtView12clearDialpadEv @ 11 NONAME + _ZN13PhoneUIQtView13bubbleManagerEv @ 12 NONAME + _ZN13PhoneUIQtView13menuReferenceEv @ 13 NONAME + _ZN13PhoneUIQtView14setMenuActionsERK5QListIP8HbActionE @ 14 NONAME + _ZN13PhoneUIQtView15setExpandActionEii @ 15 NONAME + _ZN13PhoneUIQtView15windowActivatedEv @ 16 NONAME + _ZN13PhoneUIQtView16addBubbleCommandEiP8HbAction @ 17 NONAME + _ZN13PhoneUIQtView16isDialpadVisibleEv @ 18 NONAME + _ZN13PhoneUIQtView16staticMetaObjectE @ 19 NONAME DATA 16 + _ZN13PhoneUIQtView17bringToForegroundEv @ 20 NONAME + _ZN13PhoneUIQtView17setRestrictedModeEb @ 21 NONAME + _ZN13PhoneUIQtView17setToolbarActionsERK5QListIP8HbActionE @ 22 NONAME + _ZN13PhoneUIQtView17volumeSliderValueEv @ 23 NONAME + _ZN13PhoneUIQtView17windowDeactivatedEv @ 24 NONAME + _ZN13PhoneUIQtView18removeExpandActionEi @ 25 NONAME + _ZN13PhoneUIQtView19clearAndHideDialpadEv @ 26 NONAME + _ZN13PhoneUIQtView19clearBubbleCommandsEi @ 27 NONAME + _ZN13PhoneUIQtView19getStaticMetaObjectEv @ 28 NONAME + _ZN13PhoneUIQtView20setBackButtonVisibleEb @ 29 NONAME + _ZN13PhoneUIQtView20setVolumeSliderValueEiiii @ 30 NONAME + _ZN13PhoneUIQtView21dialpadIsAboutToCloseEv @ 31 NONAME + _ZN13PhoneUIQtView23handleOrientationChangeEN2Qt11OrientationE @ 32 NONAME + _ZN13PhoneUIQtView24addParticipantListActionEiRK7QStringRK6HbIcon @ 33 NONAME + _ZN13PhoneUIQtView27clearParticipantListActionsEv @ 34 NONAME + _ZN13PhoneUIQtView4hideEv @ 35 NONAME + _ZN13PhoneUIQtView7commandEi @ 36 NONAME + _ZN13PhoneUIQtViewC2ER12HbMainWindowP13QGraphicsItem @ 37 NONAME + _ZN13PhoneUIQtViewD0Ev @ 38 NONAME + _ZN13PhoneUIQtViewD1Ev @ 39 NONAME + _ZN13PhoneUIQtViewD2Ev @ 40 NONAME + _ZNK13PhoneUIQtView10metaObjectEv @ 41 NONAME + _ZTI13PhoneUIQtView @ 42 NONAME + _ZTV13PhoneUIQtView @ 43 NONAME + _ZThn16_N13PhoneUIQtViewD0Ev @ 44 NONAME + _ZThn16_N13PhoneUIQtViewD1Ev @ 45 NONAME + _ZThn28_N13PhoneUIQtView10captureKeyEN2Qt3KeyEb @ 46 NONAME + _ZThn28_N13PhoneUIQtView11dialpadTextEv @ 47 NONAME + _ZThn28_N13PhoneUIQtView11hideDialpadEv @ 48 NONAME + _ZThn28_N13PhoneUIQtView11hideToolbarEv @ 49 NONAME + _ZThn28_N13PhoneUIQtView11showDialpadEv @ 50 NONAME + _ZThn28_N13PhoneUIQtView11showToolbarEv @ 51 NONAME + _ZThn28_N13PhoneUIQtView12clearDialpadEv @ 52 NONAME + _ZThn28_N13PhoneUIQtView13bubbleManagerEv @ 53 NONAME + _ZThn28_N13PhoneUIQtView13menuReferenceEv @ 54 NONAME + _ZThn28_N13PhoneUIQtView14setMenuActionsERK5QListIP8HbActionE @ 55 NONAME + _ZThn28_N13PhoneUIQtView15setExpandActionEii @ 56 NONAME + _ZThn28_N13PhoneUIQtView16addBubbleCommandEiP8HbAction @ 57 NONAME + _ZThn28_N13PhoneUIQtView16isDialpadVisibleEv @ 58 NONAME + _ZThn28_N13PhoneUIQtView17bringToForegroundEv @ 59 NONAME + _ZThn28_N13PhoneUIQtView17setRestrictedModeEb @ 60 NONAME + _ZThn28_N13PhoneUIQtView17setToolbarActionsERK5QListIP8HbActionE @ 61 NONAME + _ZThn28_N13PhoneUIQtView17volumeSliderValueEv @ 62 NONAME + _ZThn28_N13PhoneUIQtView18removeExpandActionEi @ 63 NONAME + _ZThn28_N13PhoneUIQtView19clearAndHideDialpadEv @ 64 NONAME + _ZThn28_N13PhoneUIQtView19clearBubbleCommandsEi @ 65 NONAME + _ZThn28_N13PhoneUIQtView20setBackButtonVisibleEb @ 66 NONAME + _ZThn28_N13PhoneUIQtView20setVolumeSliderValueEiiii @ 67 NONAME + _ZThn28_N13PhoneUIQtView24addParticipantListActionEiRK7QStringRK6HbIcon @ 68 NONAME + _ZThn28_N13PhoneUIQtView27clearParticipantListActionsEv @ 69 NONAME + _ZThn28_N13PhoneUIQtView4hideEv @ 70 NONAME + _ZThn8_N13PhoneUIQtViewD0Ev @ 71 NONAME + _ZThn8_N13PhoneUIQtViewD1Ev @ 72 NONAME + _ZN13PhoneUIQtView16shutdownPhoneAppEv @ 73 NONAME + _ZN13PhoneUIQtView18removeVolumeSliderEv @ 74 NONAME + _ZN13PhoneUIQtViewC1ER12HbMainWindowP13QGraphicsItem @ 75 NONAME + _ZThn28_N13PhoneUIQtView16shutdownPhoneAppEv @ 76 NONAME + _ZThn28_N13PhoneUIQtView18removeVolumeSliderEv @ 77 NONAME diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/inc/phoneaction.h --- a/phoneapp/phoneuiview2/inc/phoneaction.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +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: Actions and associated translated texts. -* -*/ - -#ifndef PHONEACTION_H -#define PHONEACTION_H - -#include - -#ifdef BUILD_PHONEUIQTVIEW -#define PHONEACTION_EXPORT Q_DECL_EXPORT -#else -#define PHONEACTION_EXPORT Q_DECL_IMPORT -#endif - -class PHONEACTION_EXPORT PhoneAction -{ - -public: - - class ToolBarItem { - public: - ToolBarItem(int commandId, bool enabled) : - mCommandId(commandId),mEnabled(enabled) {} - - int mCommandId; - bool mEnabled; - }; - - enum ActionType { - LeftButton = 1, - RightButton, - Text, - ToolbarButton1, - ToolbarButton2, - ToolbarButton3, - ToolbarButton4 - }; - - enum ActionRole { - None, // no specific role - default button - Accept, // positive action - green button - Decline // negative action - red button - }; - - PhoneAction (); - ~PhoneAction (); - void setText (QString text); - QString text () const; - void setCommand (int command); - int command () const; - HbIcon icon () const; - void setIcon (HbIcon icon); - void setDisabled(bool disabled); - bool isDisabled() const; - void setActionRole(ActionRole role); - ActionRole actionRole() const; - -private: - - QString m_text; - int m_command; - HbIcon m_icon; - bool m_disabled; - ActionRole m_role; -}; - -#endif // PHONEACTION_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/inc/phoneuiqtview.h --- a/phoneapp/phoneuiview2/inc/phoneuiqtview.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/inc/phoneuiqtview.h Fri Oct 15 12:58:46 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" @@ -22,16 +22,9 @@ #include #include "phoneuiqtviewif.h" #include -#include -class BubbleManager; class HbAction; -class QSignalMapper; -class HbToolBar; -class HbVolumeSliderPopup; -class Dialpad; -class XQKeyCapture; -class DialpadKeyHandler; +class PhoneUIQtViewPrivate; #ifdef BUILD_PHONEUIQTVIEW #define PHONEUIQTVIEW_EXPORT Q_DECL_EXPORT @@ -39,7 +32,6 @@ #define PHONEUIQTVIEW_EXPORT Q_DECL_IMPORT #endif -using namespace QtMobility; class PHONEUIQTVIEW_EXPORT PhoneUIQtView : public HbView, public PhoneUIQtViewIF @@ -51,12 +43,12 @@ /*! Constructor */ - PhoneUIQtView (HbMainWindow &window, QGraphicsItem *parent = 0); + PhoneUIQtView(HbMainWindow &window, QGraphicsItem *parent = 0); /*! Destructor */ - virtual ~PhoneUIQtView (); + virtual ~PhoneUIQtView(); /*! \fn void PhoneUIQtView::bubbleManager () @@ -69,16 +61,16 @@ \fn void PhoneUIQtView::addBubbleCommand () Adds new command to bubble. Command id will be emitted as - a parameter from view's command(int) signal. + a parameter from view's command(int) signal. Ownership transferred. */ - void addBubbleCommand (int bubbleId, const PhoneAction& action); + void addBubbleCommand(int bubbleId, HbAction* action); /*! \fn void PhoneUIQtView::clearBubbleCommands () Clears commands from bubble. */ - void clearBubbleCommands (int bubbleId); + void clearBubbleCommands(int bubbleId); /*! \fn void PhoneUIQtView::addParticipantListAction () @@ -97,23 +89,23 @@ /*! \fn void PhoneUIQtViewIF::setToolbarActions() - Sets toolbar actions. + Sets toolbar actions. Ownership transferred. */ - void setToolbarActions(const QList& actions); + void setToolbarActions(const QList &actions); /*! \fn void PhoneUIQtView::hideToolbar () Hides toolbar. */ - void hideToolbar (); + void hideToolbar(); /*! \fn void PhoneUIQtView::showToolbar () Shows toolbar. */ - void showToolbar (); + void showToolbar(); /*! \fn void PhoneUIQtView::volumeSliderValue () @@ -121,26 +113,26 @@ Returns HbVolumeSliderPopup's volume value. If this volume slider isn't active -1 is returned. */ - int volumeSliderValue (); + int volumeSliderValue(); /*! \fn void PhoneUIQtView::setVolumeSliderValue (int value) Sets slider value to HbVolumeSliderPopup. */ - void setVolumeSliderValue ( + void setVolumeSliderValue( int value, int commandId, int maxVolumeValue, int minVolumeValue); - + /*! - \fn void PhoneUIQtView::removeVolumeSlider () + \fn void PhoneUIQtView::removeVolumeSlider() Removes HbVolumeSliderPopup. */ - void removeVolumeSlider (); - + void removeVolumeSlider(); + /*! \fn void PhoneUIQtView::setExpandAction () @@ -205,11 +197,18 @@ void bringToForeground(); /*! + \fn void PhoneUIQtViewIF::hide() + + Lowers the phone to the bottom of the stack. + */ + void hide(); + + /*! \fn void PhoneUIQtViewIF::setToolbarActions() - Sets menu actions for call handling. + Sets menu actions for call handling. Ownership transferred. */ - void setMenuActions(const QList& actions); + void setMenuActions(const QList &actions); /*! \fn void PhoneUIQtView::setBackButtonVisible() @@ -239,66 +238,12 @@ */ void setRestrictedMode(bool restrictedMode); -public slots: - - /*! - \fn void PhoneUIQtView::volumeSliderClosed () - - HbVolumeSliderPopup calls this method when slider - is going to be closed. - */ - void volumeSliderClosed (); - - /*! - \fn void PhoneUIQtView::volumeSliderChanged (int value) - - HbVolumeSliderPopup calls this method when it's value is changed. - */ - void volumeSliderChanged(int value); - - /*! - \fn void PhoneUIQtView::handleOrientationChange(Qt::Orientation orientation) - - HbMainWindow calls this method when orientation is changed. - */ - void handleOrientationChange(Qt::Orientation orientation); - - /*! - \fn void PhoneUIQtView::backButtonClicked(Qt::Orientation orientation) - - HbMainWindow calls this method when back softkey is clicked. - */ - void backButtonClicked(); - - /*! - \fn void PhoneUIQtView::onEditorContentChanged() - - Dialpad calls this method when dialpad content is changed. - */ - void onEditorContentChanged(); - - /*! - \fn void dialpadClosed() - - Dialpad calls this method when dialpad is closed. - */ - void dialpadClosed(); - /*! \fn void PhoneUIQtView::shutdownPhoneApp() Shutdown phone application. */ void shutdownPhoneApp(); - - /*! - \fn void PhoneUIQtView::networkNameChanged(QSystemNetworkInfo::NetworkMode mode, const QString &netName) - - Network name change is informed via this method. - */ - void networkNameChanged(QSystemNetworkInfo::NetworkMode mode, const QString &netName); - - signals: /*! @@ -306,21 +251,21 @@ This signal is emitted when key is pressed down. */ - void keyPressed (QKeyEvent *event); + void keyPressed(QKeyEvent *event); /*! \fn void keyPressed (QKeyEvent *event) This signal is emitted when key is released. */ - void keyReleased (QKeyEvent *event); + void keyReleased(QKeyEvent *event); /*! \fn void command(int command) This signal is emitted when UI action is handled. */ - void command (int command); + void command(int command); /*! \fn void dialpadIsAboutToClose() @@ -343,65 +288,15 @@ */ void windowDeactivated(); -protected: - +public slots: /*! - \fn void eventFilter(int command) - - Handles key events. + \fn void handleOrientationChange(Qt::Orientation orientation) */ - bool eventFilter(QObject * watched, QEvent * event); + void handleOrientationChange(Qt::Orientation orientation); private: - - /*! - \fn void setDialpadPosition(int command) - - Sets dialpad position. - */ - void setDialpadPosition(); - - /*! - \fn void setActionRole() - - Sets action role. - */ - static void setActionRole(const PhoneAction& pa, HbAction& action); - - /*! - \fn void createToolBarActions() - - Creates tool bar actions. - */ - void createToolBarActions(); - - /*! - \fn void updateMenuVisibility() - */ - void updateMenuVisibility(); - -private: - HbMainWindow &m_window; - BubbleManager *m_bubbleManager; - QMap m_bubbleMap; - QMap *> m_bubbleActionMap; - QSignalMapper *m_signalMapper; - QList m_toolbarActions; - HbVolumeSliderPopup *m_volumeSlider; - QSignalMapper *m_expandSignalMapper; - QMap m_expandActionMap; - QSignalMapper *m_participantListSignalMapper; - QList m_participantListActions; - int m_volumeCommandId; - HbAction *m_backAction; - Dialpad *m_dialpad; - QSignalMapper *m_menuSignalMapper; - XQKeyCapture *m_keyCapture; - QSystemNetworkInfo *m_networkInfo; - QList m_keyCaptures; - DialpadKeyHandler *m_dialpadKeyHandler; - bool m_restrictedMode; - HbMenu *m_optionsMenu; + friend class PhoneUIQtViewPrivate; + PhoneUIQtViewPrivate *m_priv; }; #endif // PHONEUIQTVIEW_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/inc/phoneuiqtview_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuiview2/inc/phoneuiqtview_p.h Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,211 @@ +/*! +* 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: Phone UI's Qt view private. +* +*/ + +#ifndef PHONEUIQTVIEW_P_H +#define PHONEUIQTVIEW_P_H + +#include +#include +#include +#include + +class BubbleManager; +class HbAction; +class HbToolBar; +class HbVolumeSliderPopup; +class Dialpad; +class XQKeyCapture; +class DialpadKeyHandler; +class PhoneUIQtView; +class HbMainWindow; +class HbIcon; +class HbWidget; +class HbMenu; + +QTM_USE_NAMESPACE + +class PhoneUIQtViewPrivate : public QObject +{ + Q_OBJECT + +public: + + /*! + Constructor + */ + PhoneUIQtViewPrivate(HbMainWindow &window, PhoneUIQtView &parent); + + /*! + Destructor + */ + virtual ~PhoneUIQtViewPrivate(); + + /*! + \fn QString networkName() + */ + QString networkName(); + + /*! + \fn void addBubbleCommand() + */ + void addBubbleCommand(int bubbleId, HbAction* action); + + /*! + \fn void clearBubbleCommands () + */ + void clearBubbleCommands(int bubbleId); + + /*! + \fn void addParticipantListAction () + */ + void addParticipantListAction(int commandId, const QString &text, const HbIcon &icon); + + /*! + \fn void clearBubbleCommands () + */ + void clearParticipantListActions(); + + /*! + \fn void volumeSliderValue () + */ + int volumeSliderValue(); + + /*! + \fn void setVolumeSliderValue (int value) + */ + void setVolumeSliderValue( + int value, + int commandId, + int maxVolumeValue, + int minVolumeValue); + + /*! + \fn void setExpandAction () + */ + void setExpandAction(int bubbleId, int commandId); + + /*! + \fn void removeExpandAction () + */ + void removeExpandAction(int bubbleId); + + /*! + \fn void showDialpad() + */ + void showDialpad(); + + /*! + \fn void hideDialpad() + */ + void hideDialpad(); + + /*! + \fn void setBackButtonVisible() + */ + void setBackButtonVisible(bool visible); + + /*! + \fn void captureKey() + */ + void captureKey(Qt::Key key, bool capture); + + /* + \fn void setRestrictedMode() + */ + void setRestrictedMode(bool restrictedMode); + + /* + \fn void replaceActions(HbWidget &widget, + const QList actions) const; + */ + void replaceActions(HbWidget &widget, + const QList &actions) const; + +public slots: + + /*! + \fn void removeVolumeSlider() + */ + void removeVolumeSlider(); + + /*! + \fn void volumeSliderChanged(int value) + */ + void volumeSliderChanged(int value); + + /*! + \fn bool eventFilter(QObject *watched, QEvent * event) + */ + bool eventFilter(QObject *watched, QEvent * event); + + /*! + \fn void backButtonClicked(Qt::Orientation orientation) + */ + void backButtonClicked(); + + /*! + \fn void onEditorContentChanged() + */ + void onEditorContentChanged(); + + /*! + \fn void dialpadClosed() + */ + void dialpadClosed(); + + /*! + \fn void networkNameChanged( + QSystemNetworkInfo::NetworkMode mode, const QString &netName) + */ + void networkNameChanged( + QSystemNetworkInfo::NetworkMode mode, const QString &netName); + + /*! + \fn void PhoneUIQtView::actionTriggerred() + */ + void actionTriggerred(); + + + /*! + \fn void setDialpadPosition(Qt::Orientation orientation) + + Sets dialpad position. + */ + void setDialpadPosition(Qt::Orientation orientation); + + + +public: + PhoneUIQtView &m_parent; + HbMainWindow &m_window; + BubbleManager *m_bubbleManager; + QMap > m_bubbleActionMap; + HbVolumeSliderPopup *m_volumeSlider; + QMap m_expandActionMap; + QList m_participantListActions; + int m_volumeCommandId; + HbAction *m_backAction; + Dialpad *m_dialpad; + XQKeyCapture *m_keyCapture; + QSystemNetworkInfo *m_networkInfo; + QList m_keyCaptures; + DialpadKeyHandler *m_dialpadKeyHandler; + bool m_restrictedMode; + HbMenu *m_optionsMenu; +}; + +#endif // PHONEUIQTVIEW_P_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/inc/phoneuiqtviewif.h --- a/phoneapp/phoneuiview2/inc/phoneuiqtviewif.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/inc/phoneuiqtviewif.h Fri Oct 15 12:58:46 2010 +0300 @@ -25,7 +25,6 @@ class HbIcon; class HbAction; class HbMenu; -class PhoneAction; class PhoneUIQtViewIF { @@ -43,11 +42,11 @@ \fn void PhoneUIQtViewIF::addBubbleCommand () Adds new command to bubble. Command id will be emitted as - a parameter from view's command(int) signal. + a parameter from view's command(int) signal. Ownership transferred. */ virtual void addBubbleCommand ( int bubbleId, - const PhoneAction& action ) = 0; + HbAction *action ) = 0; /*! \fn void PhoneUIQtViewIF::clearBubbleCommands () @@ -76,9 +75,9 @@ /*! \fn void PhoneUIQtViewIF::setToolbarActions() - Sets toolbar actions. + Sets toolbar actions. Ownership transferred. */ - virtual void setToolbarActions(const QList& actions) = 0; + virtual void setToolbarActions(const QList &actions) = 0; /*! \fn void PhoneUIQtViewIF::hideToolbar () @@ -184,11 +183,18 @@ virtual void bringToForeground() = 0; /*! + \fn void PhoneUIQtViewIF::hide() + + Lowers the phone to the bottom of the stack. + */ + virtual void hide() = 0; + + /*! \fn void PhoneUIQtViewIF::setToolbarActions() - Sets menu actions. + Sets menu actions. Ownership transferred. */ - virtual void setMenuActions(const QList& actions) = 0; + virtual void setMenuActions(const QList &actions) = 0; /*! \fn void PhoneUIQtView::shutdownPhoneApp() diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/phoneuiqtview.pri --- a/phoneapp/phoneuiview2/phoneuiqtview.pri Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/phoneuiqtview.pri Fri Oct 15 12:58:46 2010 +0300 @@ -16,7 +16,7 @@ HEADERS += ./inc/phoneuiqtviewif.h HEADERS += ./inc/phoneuiqtview.h -HEADERS += ./inc/phoneaction.h +HEADERS += ./inc/phoneuiqtview_p.h SOURCES += ./src/phoneuiqtview.cpp -SOURCES += ./src/phoneaction.cpp +SOURCES += ./src/phoneuiqtview_p.cpp \ No newline at end of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/src/phoneaction.cpp --- a/phoneapp/phoneuiview2/src/phoneaction.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +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: Actions and associated translated texts. -* -*/ - -#include "phoneaction.h" - -PhoneAction::PhoneAction () : - m_text (QString ()), m_command (-1), m_icon (HbIcon ()), m_disabled(false), - m_role(PhoneAction::None) -{ -} - -PhoneAction::~PhoneAction () -{ -} - -QString PhoneAction::text () const -{ - return m_text; -} - -void PhoneAction::setText (QString text) -{ - m_text = text; -} - -int PhoneAction::command () const -{ - return m_command; -} - -void PhoneAction::setCommand (int command) -{ - m_command = command; -} - -HbIcon PhoneAction::icon () const -{ - return m_icon; -} - -void PhoneAction::setIcon (HbIcon icon) -{ - m_icon = icon; -} - -void PhoneAction::setDisabled(bool disabled) -{ - m_disabled = disabled; -} - -bool PhoneAction::isDisabled() const -{ - return m_disabled; -} - -void PhoneAction::setActionRole(ActionRole role) -{ - m_role = role; -} - -PhoneAction::ActionRole PhoneAction::actionRole() const -{ - return m_role; -} - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/src/phoneuiqtview.cpp --- a/phoneapp/phoneuiview2/src/phoneuiqtview.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/src/phoneuiqtview.cpp Fri Oct 15 12:58:46 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,86 +15,31 @@ * */ #include -#include #include #include -#include #include #include #include #include +#include -#include -#include -#include -#include - +#include "phoneuiqtview_p.h" #include "phoneuiqtview.h" -#include "phoneaction.h" #include "qtphonelog.h" PhoneUIQtView::PhoneUIQtView (HbMainWindow &window, QGraphicsItem *parent) : - HbView (parent), - m_window(window), - m_bubbleManager(0), - m_signalMapper(0), - m_volumeSlider (0), - m_expandSignalMapper(0), - m_participantListSignalMapper(0), - m_volumeCommandId(0), - m_backAction(0), - m_dialpad(0), - m_menuSignalMapper(0), - m_keyCapture(0), - m_networkInfo(0), - m_dialpadKeyHandler(0), - m_restrictedMode(false), - m_optionsMenu(0) + HbView(parent), + m_priv(new PhoneUIQtViewPrivate(window, *this)) { PHONE_TRACE // Set network name - m_networkInfo = new QSystemNetworkInfo(this); - QString networkName = m_networkInfo->networkName(QSystemNetworkInfo::WcdmaMode); - if(networkName.isEmpty()) { - networkName = m_networkInfo->networkName(QSystemNetworkInfo::GsmMode); - } - connect(m_networkInfo, SIGNAL (networkNameChanged(QSystemNetworkInfo::NetworkMode,QString)), - this, SLOT(networkNameChanged(QSystemNetworkInfo::NetworkMode, QString))); - setTitle(networkName); - - // Capturing long press of end key - m_keyCapture = new XQKeyCapture(); - - // Dialpad - m_dialpad = new Dialpad(m_window); - m_dialpad->setCallButtonEnabled(false); - m_dialpad->setTapOutsideDismiss(true); - connect(m_dialpad,SIGNAL(aboutToClose()),this, - SLOT(dialpadClosed())); + setTitle(m_priv->networkName()); // Call handling widget - m_bubbleManager = new BubbleManager (this); - setWidget(m_bubbleManager); - - // Set event filter - m_window.installEventFilter(this); - - m_signalMapper = new QSignalMapper (this); - connect(m_signalMapper, SIGNAL (mapped (int)), this, SIGNAL (command (int))); - connect(&m_window,SIGNAL(orientationChanged(Qt::Orientation)), - this,SLOT(handleOrientationChange(Qt::Orientation))); - - m_menuSignalMapper = new QSignalMapper(this); - connect(m_menuSignalMapper, SIGNAL(mapped(int)), this, SIGNAL(command(int))); - - m_bubbleManager->handleOrientationChange(m_window.orientation()); + setWidget(m_priv->m_bubbleManager); // change exit softkey to back button - m_backAction = new HbAction(Hb::BackNaviAction, this); - connect(m_backAction, SIGNAL(triggered()), this, SLOT(backButtonClicked())); - setNavigationAction(m_backAction); - - createToolBarActions(); + setNavigationAction(m_priv->m_backAction); // Set restricted mode off, normal state setRestrictedMode(false); @@ -102,60 +47,19 @@ PhoneUIQtView::~PhoneUIQtView () { - foreach (QList *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() { - return *m_bubbleManager; + return *m_priv->m_bubbleManager; } void PhoneUIQtView::addBubbleCommand ( int bubbleId, - const PhoneAction& action ) + HbAction* action ) { PHONE_TRACE - HbAction *bubbleAction = new HbAction (); - bubbleAction->setText (action.text()); - bubbleAction->setIcon (action.icon()); - setActionRole(action,*bubbleAction); - m_bubbleManager->addAction (bubbleId, bubbleAction); - - QList bubbles = m_bubbleMap.keys(); - bool found(false); - - for ( int i=0; isetMapping(bubbleAction, action.command()); - m_bubbleActionMap[bubbleId]->append(bubbleAction); - found = true; - } - } - - if (!found) { - QSignalMapper *mapper = new QSignalMapper(); - connect(mapper, SIGNAL (mapped (int)), this, SIGNAL (command (int))); - connect(bubbleAction, SIGNAL (triggered ()), mapper, SLOT (map ())); - mapper->setMapping (bubbleAction, action.command()); - QList *actionList = new QList(); - actionList->append( bubbleAction ); - m_bubbleActionMap.insert(bubbleId,actionList); - m_bubbleMap.insert(bubbleId,mapper); - } + m_priv->addBubbleCommand(bubbleId, action); } void PhoneUIQtView::addParticipantListAction( @@ -164,100 +68,28 @@ const HbIcon& icon) { PHONE_TRACE - HbAction* action = new HbAction (); - action->setText (text); - action->setIcon (icon); - m_bubbleManager->addParticipantListAction(action); - - if (!m_participantListSignalMapper) { - m_participantListSignalMapper = new QSignalMapper(); - connect(m_participantListSignalMapper, SIGNAL (mapped (int)), this, SIGNAL (command (int))); - } - - connect(action, SIGNAL (triggered ()), m_participantListSignalMapper, SLOT (map ())); - m_participantListSignalMapper->setMapping (action, commandId); - m_participantListActions.append( action ); + m_priv->addParticipantListAction(commandId, text, icon); } void PhoneUIQtView::clearParticipantListActions() { PHONE_TRACE - if (m_participantListSignalMapper) { - m_bubbleManager->clearParticipantListActions(); - - foreach (HbAction *action, m_participantListActions ) { - m_participantListSignalMapper->removeMappings(action); - } - qDeleteAll(m_participantListActions); - m_participantListActions.clear(); - delete m_participantListSignalMapper; - m_participantListSignalMapper = 0; - } - + m_priv->clearParticipantListActions(); } void PhoneUIQtView::clearBubbleCommands (int bubbleId) { PHONE_TRACE - m_bubbleManager->clearActions (bubbleId); - QSignalMapper *mapper = m_bubbleMap.value(bubbleId); - - if (mapper) { - QList *actions = m_bubbleActionMap.value(bubbleId); - if (actions) { - foreach (HbAction *action, *actions ) { - mapper->removeMappings(action); - } - - qDeleteAll(*actions); - actions->clear(); - delete actions; - } - - m_bubbleMap.remove(bubbleId); - m_bubbleActionMap.remove(bubbleId); - delete mapper; - } - + m_priv->clearBubbleCommands(bubbleId); } -void PhoneUIQtView::setToolbarActions(const QList& actions) +void PhoneUIQtView::setToolbarActions( + const QList &newToolBarActions) { PHONE_TRACE - // clear current toolbar actions - for (int i=0;iactions().count();++i) { - m_signalMapper->removeMappings( - static_cast(toolBar()->actions().at(i))); - } - - QList toolBarActions = toolBar()->actions(); + m_priv->replaceActions(*toolBar(), newToolBarActions); - if (toolBarActions.size()addAction(m_toolbarActions.at(i)); - } - } else if (toolBarActions.size()>actions.size()) { - for (int i=toolBarActions.size(); 0actions.size()) { - HbAction* action = static_cast(toolBarActions.at(i-1)); - toolBar()->removeAction(action); - } - } - } - - for (int i=0; iactions().size(); ++i) { - - if (i(toolBar()->actions().at(i)); - action->setText(actions.at(i)->text()); - action->setIcon(actions.at(i)->icon()); - action->setDisabled(actions.at(i)->isDisabled()); - - m_signalMapper->setMapping(action, actions.at(i)->command()); - } - } - - if ( m_window.orientation() == Qt::Horizontal ) { + if ( m_priv->m_window.orientation() == Qt::Horizontal ) { toolBar()->setOrientation(Qt::Horizontal); } // update toolbar @@ -266,7 +98,7 @@ void PhoneUIQtView::hideToolbar () { - toolBar()->hide (); + toolBar()->hide(); } void PhoneUIQtView::showToolbar () @@ -277,361 +109,144 @@ int PhoneUIQtView::volumeSliderValue () { - if (m_volumeSlider) { - return m_volumeSlider->value (); - } else { - return -1; - } -} - -void PhoneUIQtView::removeVolumeSlider () -{ - if (m_volumeSlider) { - if (m_volumeSlider->isVisible()) { - m_volumeSlider->hide(); - } - m_volumeSlider->deleteLater(); - m_volumeSlider = 0; - } -} - -void PhoneUIQtView::volumeSliderClosed () -{ - removeVolumeSlider(); + return m_priv->volumeSliderValue(); } void PhoneUIQtView::setVolumeSliderValue ( int value, int commandId, int maxVolumeValue, int minVolumeValue) { PHONE_TRACE - m_volumeCommandId = commandId; - - if (!m_volumeSlider) { - m_volumeSlider = new HbVolumeSliderPopup (); - m_volumeSlider->setDismissPolicy(HbDialog::TapOutside); - m_volumeSlider->setTimeout (10000); // TODO: 10 seconds for now, replace with correct value when spec is ready and says what it is - connect(m_volumeSlider, SIGNAL(valueChanged(int)), this, SLOT(volumeSliderChanged(int))); - connect(m_volumeSlider, SIGNAL(aboutToClose()), this, SLOT(volumeSliderClosed())); - } - - - if (m_volumeSlider->minimum() != minVolumeValue || - m_volumeSlider->maximum() != maxVolumeValue ) { - m_volumeSlider->setRange (minVolumeValue, maxVolumeValue); - } - - if (value != m_volumeSlider->value()) - m_volumeSlider->setValue (value); - - if (false == m_volumeSlider->isVisible()) { - m_volumeSlider->show(); - } + m_priv->setVolumeSliderValue( + value, commandId, maxVolumeValue, minVolumeValue); } -void PhoneUIQtView::volumeSliderChanged(int value) +void PhoneUIQtView::removeVolumeSlider() { - Q_UNUSED (value); - emit command (m_volumeCommandId); + PHONE_TRACE + m_priv->removeVolumeSlider(); } void PhoneUIQtView::setExpandAction(int bubbleId, int commandId) { PHONE_TRACE - removeExpandAction(bubbleId); - - HbAction* action = new HbAction(); - m_bubbleManager->setExpandAction(bubbleId, action); - - if (!m_expandSignalMapper) { - m_expandSignalMapper = new QSignalMapper(this); - connect(m_expandSignalMapper, SIGNAL (mapped (int)), - this, SIGNAL (command (int))); - } - - connect(action, SIGNAL (triggered ()), m_expandSignalMapper, SLOT (map ())); - m_expandSignalMapper->setMapping(action, commandId); - - m_expandActionMap.insert(bubbleId,action); + m_priv->setExpandAction(bubbleId, commandId); } void PhoneUIQtView::removeExpandAction(int bubbleId) { PHONE_TRACE - if (m_expandActionMap.contains(bubbleId)) { - m_bubbleManager->setExpandAction(bubbleId, 0); - HbAction* action = m_expandActionMap.value(bubbleId); - m_expandSignalMapper->removeMappings(action); - m_expandActionMap.remove(bubbleId); - delete action; - } + m_priv->removeExpandAction(bubbleId); } void PhoneUIQtView::showDialpad() { - if (false == m_dialpad->isVisible()) { - setDialpadPosition(); - m_dialpad->openDialpad(); - } + m_priv->showDialpad(); } void PhoneUIQtView::hideDialpad() { - if (true == m_dialpad->isVisible()) - m_dialpad->closeDialpad(); + m_priv->hideDialpad(); } bool PhoneUIQtView::isDialpadVisible() { - return m_dialpad->isVisible(); + return m_priv->m_dialpad->isVisible(); } QString PhoneUIQtView::dialpadText() { - return m_dialpad->editor().text(); + return m_priv->m_dialpad->editor().text(); } void PhoneUIQtView::clearAndHideDialpad() { - m_dialpad->editor().setText(QString("")); - m_dialpad->closeDialpad(); + m_priv->m_dialpad->editor().setText(QString("")); + m_priv->m_dialpad->closeDialpad(); } void PhoneUIQtView::clearDialpad() { - m_dialpad->editor().setText(QString("")); + m_priv->m_dialpad->editor().setText(QString("")); } void PhoneUIQtView::bringToForeground() { - m_window.show(); + m_priv->m_window.show(); + m_priv->m_window.raise(); +} + +void PhoneUIQtView::hide() +{ + m_priv->m_window.hide(); + m_priv->m_window.lower(); } -void PhoneUIQtView::setMenuActions(const QList& actions) +void PhoneUIQtView::setMenuActions( + const QList &actions) { - PHONE_TRACE - HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu(); + PHONE_TRACE + HbMenu *optionsMenu = &menuReference(); + m_priv->replaceActions(*optionsMenu, actions); - for (int i=optionsMenu->actions().count(); 0(optionsMenu->actions().at(i-1)); - m_menuSignalMapper->removeMappings(action); - optionsMenu->removeAction(action); - delete action; + bool visible = false; + foreach (HbAction* action, actions) { + if(action->isVisible()){ + visible = true; + break; + } } - for (int i=0; isetText(actions.at(i)->text()); - optionsMenu->addAction(action); - connect(action, SIGNAL(triggered()), m_menuSignalMapper, SLOT(map())); - m_menuSignalMapper->setMapping(action, actions.at(i)->command()); - } - updateMenuVisibility(); + PHONE_DEBUG2("- visible", visible); + HbView* view = m_priv->m_window.currentView(); + if (!visible && !m_priv->m_optionsMenu) { + PHONE_DEBUG("- takeMenu"); + //takeMenu() - Removes the menu from the view and returns it to the caller. + //ownership of the menu is transfered. + m_priv->m_optionsMenu = view->takeMenu(); + + } else if (visible && m_priv->m_optionsMenu) { + // ownership of the menu is transfered + view->setMenu(m_priv->m_optionsMenu); + m_priv->m_optionsMenu = 0; + } } HbMenu &PhoneUIQtView::menuReference() { PHONE_TRACE - HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu(); + HbMenu* optionsMenu = m_priv->m_optionsMenu ? + m_priv->m_optionsMenu : menu(); return *optionsMenu; } void PhoneUIQtView::captureKey(Qt::Key key, bool capture) { - if (capture) { - if (!m_keyCaptures.contains(key)) { - m_keyCapture->captureLongKey(key); - m_keyCapture->captureKey(key); - m_keyCaptures.append(key); - } - } else { - if (m_keyCaptures.contains(key)) { - m_keyCapture->cancelCaptureKey(key); - m_keyCapture->cancelCaptureLongKey(key); - m_keyCaptures.removeOne(key); - } - } + m_priv->captureKey(key, capture); } -void PhoneUIQtView::handleOrientationChange(Qt::Orientation orientation) +void PhoneUIQtView::handleOrientationChange( + Qt::Orientation orientation) { PHONE_TRACE if (orientation==Qt::Horizontal) { toolBar()->setOrientation(Qt::Horizontal); } - - m_bubbleManager->handleOrientationChange(orientation); - - setDialpadPosition(); -} - -void PhoneUIQtView::backButtonClicked() -{ - XQServiceUtil::toBackground(true); -} - -void PhoneUIQtView::onEditorContentChanged() -{ - m_dialpad->setCallButtonEnabled( - m_dialpad->editor().text().length()); -} - -void PhoneUIQtView::dialpadClosed() -{ - emit dialpadIsAboutToClose(); -} - -bool PhoneUIQtView::eventFilter(QObject *watched, QEvent * event) -{ - Q_UNUSED(watched); - 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() || - (m_dialpad->editor().text().length() == 0); - - if(event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); - PHONE_DEBUG2("PhoneUIQtView::eventFilter pressed key:", keyEvent->key()); - PHONE_DEBUG2("PhoneUIQtView::eventFilter isAutoRepeat:", keyEvent->isAutoRepeat()); - if ( (keyEvent->key() != Qt::Key_Yes && keyEvent->key() != Qt::Key_Enter) || - sendKeyAllowed) { - emit keyPressed(keyEvent); - keyEvent->accept(); - } - - return false; - } else if(event->type() == QEvent::KeyRelease) { - QKeyEvent *keyEvent = static_cast(event); - PHONE_DEBUG2("PhoneUIQtView::eventFilter released key:", keyEvent->key()); - if ( (keyEvent->key() != Qt::Key_Yes && keyEvent->key() != Qt::Key_Enter) || - sendKeyAllowed) { - emit keyReleased(keyEvent); - keyEvent->accept(); - } - return false; - } else if (event->type() == QEvent::WindowActivate){ - PHONE_DEBUG("PhoneUIQtView::eventFilter WindowActivate"); - emit windowActivated(); - return false; - } else if (event->type() == QEvent::WindowDeactivate){ - PHONE_DEBUG("PhoneUIQtView::eventFilter WindowDeactivate"); - emit windowDeactivated(); - return false; - }else{ - return false; - } -} - -void PhoneUIQtView::setDialpadPosition() -{ - PHONE_TRACE - QRectF screenRect(m_window.layoutRect()); - - if (m_window.orientation() == Qt::Horizontal) { - // dialpad takes half of the screen - m_dialpad->setPos(QPointF(screenRect.width()/2, - this->scenePos().y())); - m_dialpad->setPreferredSize(screenRect.width()/2, - (screenRect.height()-scenePos().y())); - } else { - // dialpad takes 65% of the screen height - qreal screenHeight = screenRect.height(); - m_dialpad->setPos(QPointF(0, - screenHeight/2.25)); - m_dialpad->setPreferredSize(screenRect.width(), - screenHeight-screenHeight/2.25); - } -} - -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) { - action.setSoftKeyRole(QAction::NegativeSoftKey); - } -} - -void PhoneUIQtView::createToolBarActions() -{ - PHONE_TRACE - for (int i=0;i<4;++i) { - HbAction* action = new HbAction(); - connect(action, SIGNAL(triggered()), m_signalMapper, SLOT(map())); - m_toolbarActions.append(action); - } -} - -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"); + PHONE_TRACE QCoreApplication::quit(); } void PhoneUIQtView::setBackButtonVisible(bool visible) { - if (!m_restrictedMode) { - m_backAction->setEnabled(visible); + if (!m_priv->m_restrictedMode) { + m_priv->m_backAction->setEnabled(visible); } } void PhoneUIQtView::setRestrictedMode(bool restrictedMode) { PHONE_TRACE - m_restrictedMode = restrictedMode; - m_backAction->setEnabled(!restrictedMode); - m_dialpad->setCallButtonEnabled(false); - m_dialpad->editor().setText(""); // Clead dialpad - if (m_restrictedMode) { - delete m_dialpadKeyHandler; - m_dialpadKeyHandler = 0; - m_dialpadKeyHandler = new DialpadKeyHandler( - m_dialpad, DialpadKeyHandler::EmergencyCall, this); - disconnect(&m_dialpad->editor(),SIGNAL(contentsChanged()), - this, SLOT(onEditorContentChanged())); // Let emergency handler do updating - } else { - delete m_dialpadKeyHandler; - m_dialpadKeyHandler = 0; - // enable key sequence handling during a call - m_dialpadKeyHandler = new DialpadKeyHandler( - m_dialpad, DialpadKeyHandler::KeySequence, this); - connect(&m_dialpad->editor(),SIGNAL(contentsChanged()), - SLOT(onEditorContentChanged())); // Update our self - } - + m_priv->setRestrictedMode(restrictedMode); } - -void PhoneUIQtView::networkNameChanged(QSystemNetworkInfo::NetworkMode mode, const QString &netName) -{ - if((mode == QSystemNetworkInfo::GsmMode) || - (mode == QSystemNetworkInfo::WcdmaMode)) { - setTitle(netName); - } -} - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/src/phoneuiqtview_p.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuiview2/src/phoneuiqtview_p.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,425 @@ +/*! +* 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: Phone UI's Qt view private. +* +*/ +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include "phoneuiqtview.h" +#include "phoneuiqtview_p.h" +#include "qtphonelog.h" + +PhoneUIQtViewPrivate::PhoneUIQtViewPrivate( + HbMainWindow &window, PhoneUIQtView &parent) : + QObject(&parent), + m_parent(parent), + m_window(window), + m_bubbleManager(new BubbleManager(&m_parent)), + m_volumeSlider (0), + m_volumeCommandId(0), + m_backAction(0), + m_dialpad(0), + m_keyCapture(0), + m_networkInfo(new QSystemNetworkInfo(this)), + m_dialpadKeyHandler(0), + m_restrictedMode(false), + m_optionsMenu(0) +{ + PHONE_TRACE + // Set network name + connect(m_networkInfo, SIGNAL( + networkNameChanged(QSystemNetworkInfo::NetworkMode,QString)), + this, SLOT( + networkNameChanged(QSystemNetworkInfo::NetworkMode, QString))); + + // Capturing long press of end key + m_keyCapture = new XQKeyCapture(); + + // Dialpad + m_dialpad = new Dialpad(m_window); + m_dialpad->setCallButtonEnabled(false); + m_dialpad->setTapOutsideDismiss(true); + connect(m_dialpad,SIGNAL(aboutToClose()),this, + SLOT(dialpadClosed())); + + // Set event filter + m_window.installEventFilter(this); + + connect(&m_window,SIGNAL(orientationChanged(Qt::Orientation)), + this,SLOT(setDialpadPosition(Qt::Orientation))); + + connect(&m_window,SIGNAL(orientationChanged(Qt::Orientation)), + m_bubbleManager,SLOT(handleOrientationChange(Qt::Orientation))); + + m_bubbleManager->handleOrientationChange(m_window.orientation()); + + // change exit softkey to back button + m_backAction = new HbAction(Hb::BackNaviAction, this); + connect(m_backAction, SIGNAL(triggered()), this, SLOT(backButtonClicked())); + +} + +PhoneUIQtViewPrivate::~PhoneUIQtViewPrivate() +{ + foreach (QList actions, m_bubbleActionMap) { + qDeleteAll(actions); + } + + qDeleteAll(m_participantListActions); + qDeleteAll(m_expandActionMap); + m_window.removeEventFilter(this); + delete m_keyCapture; + delete m_volumeSlider; + delete m_dialpad; + delete m_optionsMenu; +} + +QString PhoneUIQtViewPrivate::networkName() +{ + QString networkName = m_networkInfo->networkName(QSystemNetworkInfo::WcdmaMode); + if(networkName.isEmpty()) { + networkName = m_networkInfo->networkName(QSystemNetworkInfo::GsmMode); + } + return networkName; +} + +void PhoneUIQtViewPrivate::addBubbleCommand ( + int bubbleId, + HbAction* action ) +{ + PHONE_TRACE + m_bubbleManager->addAction(bubbleId, action); + + QList bubbles = m_bubbleActionMap.keys(); + bool found(false); + + for ( int i=0; i actionList; + actionList.append(action); + m_bubbleActionMap.insert(bubbleId,actionList); + } +} + +void PhoneUIQtViewPrivate::addParticipantListAction( + int commandId, + const QString& text, + const HbIcon& icon) +{ + PHONE_TRACE + QScopedPointer action(new HbAction()); + action->setText(text); + action->setIcon(icon); + action->setProperty("command", commandId); + m_bubbleManager->addParticipantListAction(action.data()); + + connect(action.data(), SIGNAL(triggered()), this, SLOT(actionTriggerred())); + m_participantListActions.append(action.take()); +} + +void PhoneUIQtViewPrivate::clearParticipantListActions() +{ + PHONE_TRACE + m_bubbleManager->clearParticipantListActions(); + qDeleteAll(m_participantListActions); + m_participantListActions.clear(); +} + +void PhoneUIQtViewPrivate::clearBubbleCommands (int bubbleId) +{ + PHONE_TRACE + m_bubbleManager->clearActions(bubbleId); + qDeleteAll(m_bubbleActionMap.take(bubbleId)); +} + +int PhoneUIQtViewPrivate::volumeSliderValue() +{ + if (m_volumeSlider) { + return m_volumeSlider->value (); + } else { + return -1; + } +} + +void PhoneUIQtViewPrivate::removeVolumeSlider() +{ + if (m_volumeSlider) { + if (m_volumeSlider->isVisible()) { + m_volumeSlider->hide(); + } + m_volumeSlider->deleteLater(); + m_volumeSlider = 0; + } +} + +void PhoneUIQtViewPrivate::setVolumeSliderValue ( + int value, int commandId, int maxVolumeValue, int minVolumeValue) +{ + PHONE_TRACE + m_volumeCommandId = commandId; + + if (!m_volumeSlider) { + m_volumeSlider = new HbVolumeSliderPopup(); + m_volumeSlider->setDismissPolicy(HbDialog::TapOutside); + m_volumeSlider->setTimeout(10000); // TODO: 10 seconds for now, replace with correct value when spec is ready and says what it is + connect(m_volumeSlider, SIGNAL(valueChanged(int)), this, SLOT(volumeSliderChanged(int))); + connect(m_volumeSlider, SIGNAL(aboutToClose()), this, SLOT(removeVolumeSlider())); + } + + + if (m_volumeSlider->minimum() != minVolumeValue || + m_volumeSlider->maximum() != maxVolumeValue ) { + m_volumeSlider->setRange(minVolumeValue, maxVolumeValue); + } + + if (value != m_volumeSlider->value()) { + m_volumeSlider->setValue(value); + } + + + if (false == m_volumeSlider->isVisible()) { + m_volumeSlider->show(); + } +} + +void PhoneUIQtViewPrivate::volumeSliderChanged(int value) +{ + Q_UNUSED (value); + emit m_parent.command(m_volumeCommandId); +} + +void PhoneUIQtViewPrivate::setExpandAction(int bubbleId, int commandId) +{ + PHONE_TRACE + removeExpandAction(bubbleId); + + QScopedPointer action(new HbAction()); + action->setProperty("command", commandId); + m_bubbleManager->setExpandAction(bubbleId, action.data()); + + connect(action.data(), SIGNAL(triggered()), this, SLOT(actionTriggerred())); + + m_expandActionMap.insert(bubbleId, action.take()); +} + +void PhoneUIQtViewPrivate::removeExpandAction(int bubbleId) +{ + PHONE_TRACE + if (m_expandActionMap.contains(bubbleId)) { + m_bubbleManager->setExpandAction(bubbleId, 0); + delete m_expandActionMap.take(bubbleId); + } +} + +void PhoneUIQtViewPrivate::showDialpad() +{ + if (false == m_dialpad->isVisible()) { + setDialpadPosition(m_window.orientation()); + m_dialpad->openDialpad(); + } +} + +void PhoneUIQtViewPrivate::hideDialpad() +{ + if (true == m_dialpad->isVisible()) + m_dialpad->closeDialpad(); +} + +void PhoneUIQtViewPrivate::replaceActions( + HbWidget &widget, const QList &actions) const +{ + + // Memorize old actions, so that widget doenst flash while updating + QList oldActions = widget.actions(); + + // Add new toolbar actions + foreach (HbAction *newAction, actions) { + newAction->setParent(&widget); // Transfer ownership + connect(newAction, SIGNAL(triggered()), this, SLOT(actionTriggerred())); + widget.addAction(newAction); + } + + // Remove and delete old actions + foreach (QAction *oldAction, oldActions) { + widget.removeAction(oldAction); + delete oldAction; + } + +} + +void PhoneUIQtViewPrivate::captureKey(Qt::Key key, bool capture) +{ + if (capture) { + if (!m_keyCaptures.contains(key)) { + m_keyCapture->captureLongKey(key); + m_keyCapture->captureKey(key); + m_keyCaptures.append(key); + } + } else { + if (m_keyCaptures.contains(key)) { + m_keyCapture->cancelCaptureKey(key); + m_keyCapture->cancelCaptureLongKey(key); + m_keyCaptures.removeOne(key); + } + } +} + +void PhoneUIQtViewPrivate::backButtonClicked() +{ + XQServiceUtil::toBackground(true); +} + +void PhoneUIQtViewPrivate::onEditorContentChanged() +{ + m_dialpad->setCallButtonEnabled( + m_dialpad->editor().text().length()); +} + +void PhoneUIQtViewPrivate::dialpadClosed() +{ + emit m_parent.dialpadIsAboutToClose(); +} + +bool PhoneUIQtViewPrivate::eventFilter(QObject *watched, QEvent * event) +{ + Q_UNUSED(watched); + 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() || + (m_dialpad->editor().text().length() == 0); + + if(event->type() == QEvent::KeyPress) { + QKeyEvent *keyEvent = static_cast(event); + PHONE_DEBUG2("PhoneUIQtView::eventFilter pressed key:", keyEvent->key()); + PHONE_DEBUG2("PhoneUIQtView::eventFilter isAutoRepeat:", keyEvent->isAutoRepeat()); + if ( (keyEvent->key() != Qt::Key_Yes && keyEvent->key() != Qt::Key_Enter) || + sendKeyAllowed) { + emit m_parent.keyPressed(keyEvent); + keyEvent->accept(); + } + + return false; + } else if(event->type() == QEvent::KeyRelease) { + QKeyEvent *keyEvent = static_cast(event); + PHONE_DEBUG2("PhoneUIQtView::eventFilter released key:", keyEvent->key()); + if ( (keyEvent->key() != Qt::Key_Yes && keyEvent->key() != Qt::Key_Enter) || + sendKeyAllowed) { + emit m_parent.keyReleased(keyEvent); + keyEvent->accept(); + } + return false; + } else if (event->type() == QEvent::WindowActivate){ + PHONE_DEBUG("PhoneUIQtView::eventFilter WindowActivate"); + emit m_parent.windowActivated(); + return false; + } else if (event->type() == QEvent::WindowDeactivate){ + PHONE_DEBUG("PhoneUIQtView::eventFilter WindowDeactivate"); + emit m_parent.windowDeactivated(); + return false; + }else{ + return false; + } +} + +void PhoneUIQtViewPrivate::setDialpadPosition(Qt::Orientation orientation) +{ + PHONE_TRACE + QRectF screenRect(m_window.layoutRect()); + + if (orientation == Qt::Horizontal) { + // dialpad takes half of the screen + m_dialpad->setPos(QPointF(screenRect.width()/2, + m_parent.scenePos().y())); + m_dialpad->setPreferredSize(screenRect.width()/2, + (screenRect.height()-m_parent.scenePos().y())); + } else { + // dialpad takes 65% of the screen height + qreal screenHeight = screenRect.height(); + m_dialpad->setPos(QPointF(0, + screenHeight/2.25)); + m_dialpad->setPreferredSize(screenRect.width(), + screenHeight-screenHeight/2.25); + } +} + +void PhoneUIQtViewPrivate::setBackButtonVisible(bool visible) +{ + if (!m_restrictedMode) { + m_backAction->setEnabled(visible); + } +} + +void PhoneUIQtViewPrivate::setRestrictedMode(bool restrictedMode) +{ + PHONE_TRACE + m_restrictedMode = restrictedMode; + m_backAction->setEnabled(!restrictedMode); + m_dialpad->setCallButtonEnabled(false); + m_dialpad->editor().setText(""); // Clead dialpad + if (m_restrictedMode) { + delete m_dialpadKeyHandler; + m_dialpadKeyHandler = 0; + m_dialpadKeyHandler = new DialpadKeyHandler( + m_dialpad, DialpadKeyHandler::EmergencyCall, this); + disconnect(&m_dialpad->editor(),SIGNAL(contentsChanged()), + this, SLOT(onEditorContentChanged())); // Let emergency handler do updating + } else { + delete m_dialpadKeyHandler; + m_dialpadKeyHandler = 0; + // enable key sequence handling during a call + m_dialpadKeyHandler = new DialpadKeyHandler( + m_dialpad, DialpadKeyHandler::KeySequence, this); + connect(&m_dialpad->editor(),SIGNAL(contentsChanged()), + SLOT(onEditorContentChanged())); // Update our self + } + +} + +void PhoneUIQtViewPrivate::networkNameChanged( + QSystemNetworkInfo::NetworkMode mode, const QString &netName) +{ + if((mode == QSystemNetworkInfo::GsmMode) || + (mode == QSystemNetworkInfo::WcdmaMode)) { + m_parent.setTitle(netName); + } +} + + +void PhoneUIQtViewPrivate::actionTriggerred() +{ + if (sender()->property("command").isValid()) { + emit m_parent.command(sender()->property("command").toInt()); + } else { + PHONE_TRACE1(": No command found!") + } +} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbtoolbar.h --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbtoolbar.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +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 HBTOOLBAR_H -#define HBTOOLBAR_H - -#include -#include - -class HbAction; - -extern bool m_clearCalled; -extern bool m_hideCalled; -extern bool m_showCalled; -extern bool m_clearActionsCalled; -extern bool m_setOrientationCalled; -extern bool m_toolBarUpdateCalled; -extern HbAction *m_action; -extern QList m_actions; - - -class HbToolBar : public QObject -{ - Q_OBJECT - -public: - - HbToolBar (QObject *parent = 0); - virtual ~HbToolBar () {}; - void reset (); - void clear (); - void hide (); - void show (); - void addAction (HbAction *action); - void clearActions (); - void setOrientation(Qt::Orientation orientation); - void removeAction(HbAction *action); - QList actions() const; - void update(); - -private: - -}; - -#endif // HBTOOLBAR_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbtoolbar_stub.cpp --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbtoolbar_stub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#include "hbtoolbar.h" -#include - -bool m_clearCalled; -bool m_hideCalled; -bool m_showCalled; -bool m_clearActionsCalled; -bool m_setOrientationCalled; -bool m_toolBarUpdateCalled; -HbAction *m_action; -QList m_actions; - -HbToolBar::HbToolBar (QObject *parent) -{ - Q_UNUSED (parent); - reset (); -} - -void HbToolBar::reset () -{ - m_clearCalled = false; - m_hideCalled = false; - m_showCalled = false; - m_clearActionsCalled = false; - m_toolBarUpdateCalled = false; - m_action = 0; -} - -void HbToolBar::clear () -{ - m_clearCalled = true; -} - -void HbToolBar::hide () -{ - m_hideCalled = true; -} - -void HbToolBar::show () -{ - m_showCalled = true; -} - -void HbToolBar::addAction (HbAction *action) -{ - m_action = action; - m_actions.append(action); -} - -void HbToolBar::clearActions () -{ - m_clearActionsCalled = true; -} - -void HbToolBar::setOrientation(Qt::Orientation orientation) -{ - m_setOrientationCalled = true; -} - -void HbToolBar::removeAction(HbAction *action) -{ - m_actions.removeOne(action); -} - -QList HbToolBar::actions() const -{ - return m_actions; -} - -void HbToolBar::update() -{ - m_toolBarUpdateCalled = true; -} - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbvolumesliderpopup.h --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbvolumesliderpopup.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +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 HBVOLUMESLIDERPOPUP_H -#define HBVOLUMESLIDERPOPUP_H - -#include -#include - -extern bool m_volumeSliderContructorCalled; -extern bool m_volumeSliderDesctructorCalled; -extern bool m_volumeSliderSetValueCalled; -extern int m_sliderValue; -extern bool m_volumeSliderValueCalled; -extern bool m_volumeSliderSetRangeCalled; -extern int m_sliderRangeMin; -extern int m_sliderRangeMax; -extern bool m_volumeSliderSetTimeoutCalled; -extern int m_sliderTimeout; -extern bool m_volumeSliderShowCalled; -extern bool m_isVisible; -extern bool m_volumeSliderHideCalled; - -class HbVolumeSliderPopup : public QObject -{ - Q_OBJECT - -public: - HbVolumeSliderPopup (); - ~HbVolumeSliderPopup (); - - void setValue (int value); - int value (); - void setRange (int min, int max); - void setTimeout (int time); - void show(); - void hide(); - void setDismissPolicy( HbPopup::DismissPolicy value ) {;}; - int minimum() {return m_sliderRangeMin;}; - int maximum() {return m_sliderRangeMax;}; - bool isVisible() {return m_isVisible;}; - - -signals: - void aboutToClose (); - void valueChanged (int); - -}; - -#endif // HBVOLUMESLIDERPOPUP_H \ No newline at end of file diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbvolumesliderpopup_stub.cpp --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/hbvolumesliderpopup_stub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include "hbvolumesliderpopup.h" - -bool m_volumeSliderContructorCalled; -bool m_volumeSliderDesctructorCalled; -int m_sliderValue; -int m_sliderRangeMin; -int m_sliderRangeMax; -bool m_volumeSliderSetValueCalled; -bool m_volumeSliderValueCalled; -bool m_volumeSliderSetRangeCalled; -bool m_volumeSliderSetTimeoutCalled; -int m_sliderTimeout; -bool m_volumeSliderShowCalled; -bool m_isVisible; -bool m_volumeSliderHideCalled; - -HbVolumeSliderPopup::HbVolumeSliderPopup () -{ - m_volumeSliderContructorCalled = true; - m_volumeSliderDesctructorCalled = false; - m_sliderValue = -1; - m_sliderRangeMin = -1; - m_sliderRangeMax = -1; - m_volumeSliderSetValueCalled = false; - m_volumeSliderValueCalled = false; - m_volumeSliderSetRangeCalled = false; - m_volumeSliderSetTimeoutCalled = false; - m_sliderTimeout = -1; - m_volumeSliderShowCalled = false; -} - -HbVolumeSliderPopup::~HbVolumeSliderPopup () -{ - m_volumeSliderDesctructorCalled = true; - m_volumeSliderContructorCalled = false; - m_sliderValue = -1; - m_sliderRangeMin = -1; - m_sliderRangeMax = -1; - m_volumeSliderSetValueCalled = false; - m_volumeSliderValueCalled = false; - m_volumeSliderSetRangeCalled = false; - m_volumeSliderSetTimeoutCalled = false; - m_sliderTimeout = -1; - m_volumeSliderShowCalled = false; - - emit aboutToClose (); -} - -void HbVolumeSliderPopup::setValue (int value) -{ - m_volumeSliderSetValueCalled = true; - m_sliderValue = value; -} - -int HbVolumeSliderPopup::value () -{ - m_volumeSliderValueCalled = true; - return m_sliderValue; -} - -void HbVolumeSliderPopup::setRange (int min, int max) -{ - m_volumeSliderSetRangeCalled = true; - m_sliderRangeMin = min; - m_sliderRangeMax = max; -} - -void HbVolumeSliderPopup::setTimeout (int time) -{ - m_volumeSliderSetTimeoutCalled = true; - m_sliderTimeout = time; -} - -void HbVolumeSliderPopup::show () -{ - m_volumeSliderShowCalled = true; - m_isVisible = true; -} - -void HbVolumeSliderPopup::hide() -{ - m_volumeSliderHideCalled = true; - m_isVisible = false; -} - diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/qsysteminfo.h --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/qsysteminfo.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +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: -* -*/ -#ifndef QSYSTEMINFO_H -#define QSYSTEMINFO_H - -#include - -namespace QtMobility { - -} - -class QSystemNetworkInfo : public QObject -{ - Q_OBJECT - -public: - - enum NetworkMode { - UnknownMode=0, - GsmMode, - CdmaMode, - WcdmaMode, - WlanMode, - EthernetMode, - BluetoothMode, - WimaxMode - }; - - QSystemNetworkInfo (QObject *parent = 0); - virtual ~QSystemNetworkInfo () {}; - static QString networkName(QSystemNetworkInfo::NetworkMode mode); - -signals: - void networkNameChanged(QSystemNetworkInfo::NetworkMode,const QString &); - -private: - -}; - -#endif // QSYSTEMINFO_H diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/qsysteminfo_stub.cpp --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/qsysteminfo_stub.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -#include "qsysteminfo.h" - -QSystemNetworkInfo::QSystemNetworkInfo(QObject *parent) : QObject(parent) -{ - -} - -QString QSystemNetworkInfo::networkName(QSystemNetworkInfo::NetworkMode mode) -{ - QString networkName = "Unit test network"; - return networkName; -} diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -16,6 +16,7 @@ */ #include +#include #include #include #include @@ -27,33 +28,25 @@ #include #include #include -#define protected public -#define private public -#include "phoneuiqtview.h" -#undef public -#include "phoneaction.h" +#include "phoneuiqtview_p.h" #include #include #include #include #include #include "xqserviceutil.h" -#include "phoneaction.h" +#define private public +#include "phoneuiqtview.h" //CONSTANTS static const int KMAXVOLUME = 10; static const int KMINVOLUME = 0; static const int KVOLUMECOMMAND = 5; -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[]) \ { \ - HbApplication app(argc, argv); \ + QCoreApplication app(argc, argv); \ TestObject tc; \ QResource::registerResource("../hbcore.rcc"); \ int ret = QTest::qExec(&tc, argc, argv); \ @@ -65,7 +58,7 @@ return ret; \ } -class TestPhoneUIQtView : public QObject +class TestPhoneUIQtView : public QObject, public MockService { Q_OBJECT @@ -91,7 +84,6 @@ void testVolumeSliderChanged (); void testParticipantListAction (); void testSetExpandAction (); - void testPhoneAction (); void testSetOrientation (); void testBackButtonClicked(); void testShowDialpad(); @@ -109,16 +101,13 @@ private: PhoneUIQtView *m_view; // class under test HbMainWindow *m_main_window; - + HbLineEdit *m_lineEdit; + HbToolBar *m_toolBar; }; -void QTimer::stop() +TestPhoneUIQtView::TestPhoneUIQtView () { - m_qtimer_stop_called = true; -} - -TestPhoneUIQtView::TestPhoneUIQtView () -{ + } TestPhoneUIQtView::~TestPhoneUIQtView () @@ -128,169 +117,197 @@ void TestPhoneUIQtView::initTestCase () { m_main_window = new HbMainWindow(); + m_lineEdit = new HbLineEdit(); + m_toolBar = new HbToolBar(); + SmcDefaultValue::SetL(QPointF(0, 0)); + SmcDefaultValue::SetL(QRectF(0, 0, 0, 0)); + SmcDefaultValue::SetL(QVariant(0)); + SmcDefaultValue::SetL(Qt::Horizontal); + SmcDefaultValue::SetL(m_lineEdit); + SmcDefaultValue::SetL(*m_lineEdit); + + EXPECT(HbView, setTitle).with(QString("Unit test network")); + EXPECT(QtMobility::QSystemNetworkInfo, networkName).returns(QString("Unit test network")); m_view = new PhoneUIQtView(*m_main_window); - QCOMPARE(m_networkName, QString("Unit test network")); + QVERIFY(verify()); } void TestPhoneUIQtView::cleanupTestCase () { + SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); delete m_view; + delete m_lineEdit; + delete m_toolBar; + delete m_main_window; } -void TestPhoneUIQtView::init () +void TestPhoneUIQtView::init() { - m_qtimer_stop_called = false; - m_take_menu_called = false; - m_set_menu_called = false; + initialize(); } void TestPhoneUIQtView::cleanup () { + reset(); } void TestPhoneUIQtView::testAddBubbleCommand () { - m_view->bubbleManager ().startChanges (); + m_view->bubbleManager().startChanges(); int bubbleId = createCallHeader(); int bubbleId2 = createCallHeader(); - PhoneAction action1; - action1.setText("Command 1"); - action1.setCommand(1); - action1.setActionRole(PhoneAction::None); + HbAction *action1 = new HbAction; + action1->setText("Command 1"); + action1->setProperty("command", 1); + action1->setSoftKeyRole(QAction::NoSoftKey); - PhoneAction action2; - action2.setText("Command 2"); - action2.setCommand(2); - action2.setActionRole(PhoneAction::Accept); + HbAction *action2 = new HbAction; + action2->setText("Command 2"); + action2->setProperty("command", 2); + action2->setSoftKeyRole(QAction::PositiveSoftKey); - PhoneAction action3; - action3.setText("Command 3"); - action3.setCommand(3); - action3.setActionRole(PhoneAction::Decline); + HbAction *action3 = new HbAction; + action3->setText("Command 3"); + action3->setProperty("command", 3); + action3->setSoftKeyRole(QAction::NegativeSoftKey); - m_view->addBubbleCommand (bubbleId, action1); - m_view->addBubbleCommand (bubbleId, action2); - m_view->addBubbleCommand (bubbleId2, action3); - m_view->bubbleManager ().endChanges (); + m_view->addBubbleCommand(bubbleId, action1); + m_view->addBubbleCommand(bubbleId, action2); + m_view->addBubbleCommand(bubbleId2, action3); + m_view->bubbleManager().endChanges(); - m_view->bubbleManager ().startChanges (); - m_view->clearBubbleCommands (bubbleId); - m_view->clearBubbleCommands (bubbleId2); - m_view->clearBubbleCommands (bubbleId2); - m_view->bubbleManager ().endChanges (); + m_view->bubbleManager().startChanges(); + m_view->clearBubbleCommands(bubbleId); + m_view->clearBubbleCommands(bubbleId2); + m_view->clearBubbleCommands(bubbleId2); + m_view->bubbleManager().endChanges(); } void TestPhoneUIQtView::testHideToolbar () { - m_view->hideToolbar (); - QCOMPARE (m_hideCalled, true); + EXPECT(HbView, toolBar).returns(m_toolBar); + m_view->hideToolbar(); + QVERIFY(verify()); } void TestPhoneUIQtView::testShowToolbar () { - m_view->showToolbar (); - QCOMPARE (m_showCalled, true); + EXPECT(HbView, toolBar).returns(m_toolBar); + m_view->showToolbar(); + QVERIFY(verify()); } void TestPhoneUIQtView::testAddToolbarActions () { - m_actions.clear(); HbIcon icon ("foo.jpg"); - PhoneAction *testAction = new PhoneAction (); + HbAction *testAction = new HbAction (); testAction->setIcon(icon); testAction->setText("foo"); - testAction->setCommand(20); - QList actions; + testAction->setProperty("command", 20); + QList actions; + QList retActions; + EXPECT(QGraphicsWidget, actions).returns(retActions); actions.append(testAction); m_view->setToolbarActions(actions); - QCOMPARE (m_action->icon(), icon); - QCOMPARE(true, m_toolBarUpdateCalled); + //QCOMPARE (m_action->icon(), icon); + //QCOMPARE(true, m_toolBarUpdateCalled); + actions[0] = new HbAction(); + EXPECT(QGraphicsWidget, actions).returns(retActions); m_view->setToolbarActions(actions); - m_toolBarUpdateCalled = false; - PhoneAction *testAction2 = new PhoneAction (); + EXPECT(QGraphicsItem, update); + HbAction *testAction2 = new HbAction (); testAction2->setIcon(icon); testAction2->setText("foo2"); - testAction2->setCommand(21); + testAction2->setProperty("command", 21); + actions[0] = new HbAction(); actions.append(testAction2); + EXPECT(QGraphicsWidget, actions).returns(retActions); m_view->setToolbarActions(actions); - QCOMPARE(true, m_toolBarUpdateCalled); + QVERIFY(verify()); actions.removeOne(testAction2); - m_toolBarUpdateCalled = false; + EXPECT(QGraphicsItem, update); + actions[0] = new HbAction(); + EXPECT(QGraphicsWidget, actions).returns(retActions); m_view->setToolbarActions(actions); - QCOMPARE(true, m_toolBarUpdateCalled); + QVERIFY(verify()); actions.clear(); - delete testAction; - delete testAction2; } void TestPhoneUIQtView::testSetVolumeSliderValue () { - m_view->setVolumeSliderValue (1, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); - QCOMPARE (m_volumeSliderContructorCalled, true); - QCOMPARE (m_sliderRangeMin, KMINVOLUME); - QCOMPARE (m_sliderRangeMax, KMAXVOLUME); - QCOMPARE (m_volumeSliderSetTimeoutCalled, true); - QCOMPARE (m_sliderTimeout, 10000); - QCOMPARE (m_volumeSliderSetValueCalled, true); - QCOMPARE (m_sliderValue, 1); - QCOMPARE (m_volumeSliderShowCalled, true); + EXPECT(HbPopup, setDismissPolicy).with(HbDialog::TapOutside); + EXPECT(HbPopup, setTimeout).with(10000); + EXPECT(HbSliderPopup, minimum).returns(0); + EXPECT(HbSliderPopup, maximum).returns(100); + EXPECT(HbSliderPopup, setRange).with(KMINVOLUME, KMAXVOLUME); + EXPECT(HbSliderPopup, setValue).with(1); + EXPECT(QGraphicsItem, isVisible).returns(false); + //EXPECT(QGraphicsItem, show); + m_view->setVolumeSliderValue(1, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); + + QVERIFY(verify()); + reset(); - // reset values - m_volumeSliderContructorCalled = false; - m_volumeSliderSetValueCalled = false; - m_sliderRangeMin = -1; - m_sliderRangeMax = -1; - m_volumeSliderSetTimeoutCalled = false; - m_sliderTimeout = -1; - m_volumeSliderSetValueCalled = false; - m_sliderValue = -1; - m_volumeSliderShowCalled = false; - // The second call shouldn't create a new instance + EXPECT(HbPopup, setDismissPolicy).with(HbDialog::TapOutside).times(0); + EXPECT(HbPopup, setTimeout).with(10000).times(0); + EXPECT(HbSliderPopup, minimum).returns(0); + EXPECT(HbSliderPopup, maximum).returns(100); + EXPECT(HbSliderPopup, setRange).with(KMINVOLUME, KMAXVOLUME); + EXPECT(HbSliderPopup, setValue).with(2); + EXPECT(QGraphicsItem, isVisible).returns(true); + //EXPECT(QGraphicsItem, show).times(0); m_view->setVolumeSliderValue (2, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); - QCOMPARE (m_volumeSliderContructorCalled, false); - QCOMPARE (m_sliderRangeMin, KMINVOLUME); - QCOMPARE (m_sliderRangeMax, KMAXVOLUME); - QCOMPARE (m_volumeSliderSetTimeoutCalled, false); - QCOMPARE (m_sliderTimeout, -1); - QCOMPARE (m_volumeSliderSetValueCalled, true); - QCOMPARE (m_sliderValue, 2); - QCOMPARE (m_volumeSliderShowCalled, false); + + QVERIFY(verify()); } void TestPhoneUIQtView::testRemoveVolumeSlider () { + //EXPECT(QGraphicsItem, hide); m_view->setVolumeSliderValue (1, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); m_view->removeVolumeSlider (); - QCOMPARE (m_volumeSliderHideCalled, true); + QVERIFY(verify()); } void TestPhoneUIQtView::testVolumeSliderValue () { - m_sliderValue = -1; - int value = m_view->volumeSliderValue (); - QCOMPARE (m_sliderValue, -1); - m_view->setVolumeSliderValue (3, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); - value = m_view->volumeSliderValue (); - QCOMPARE (m_volumeSliderValueCalled, true); + EXPECT(HbSliderPopup, value).returns(4); + int value = m_view->volumeSliderValue(); + QCOMPARE (value, -1); + + // Create slider + m_view->setVolumeSliderValue (1, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); + + EXPECT(HbSliderPopup, value).returns(7); + value = m_view->volumeSliderValue(); + QCOMPARE (value, 7); + + EXPECT(HbSliderPopup, value).returns(3); + value = m_view->volumeSliderValue(); QCOMPARE (value, 3); } void TestPhoneUIQtView::testVolumeSliderChanged () { - m_view->setVolumeSliderValue (3, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); - QSignalSpy spy (m_view, SIGNAL(command(int))); - m_view->volumeSliderChanged (1); - QCOMPARE (spy.count(), 1); - int command = qvariant_cast(spy.at (0).at (0)); - QCOMPARE (command, (int)KVOLUMECOMMAND); + m_view->setVolumeSliderValue(3, KVOLUMECOMMAND, KMAXVOLUME, KMINVOLUME); + QSignalSpy spy(m_view, SIGNAL(command(int))); + m_view->m_priv->volumeSliderChanged(1); + QCOMPARE(spy.count(), 1); + int command = qvariant_cast(spy.at(0).at(0)); + QCOMPARE(command, (int)KVOLUMECOMMAND); } void TestPhoneUIQtView::testParticipantListAction () @@ -324,34 +341,16 @@ m_view->bubbleManager ().endChanges (); } -void TestPhoneUIQtView::testPhoneAction () -{ - PhoneAction *action = new PhoneAction (); - QString string("Action"); - action->setText(string); - HbIcon icon; - action->setIcon(icon); - int commandId(1); - action->setCommand(commandId); - action->setDisabled(true); - QCOMPARE( string, action->text() ); - QCOMPARE( icon, action->icon() ); - QCOMPARE( commandId, action->command() ); - QCOMPARE( true, action->isDisabled() ); - delete action; -} - void TestPhoneUIQtView::testSetOrientation () { - - m_setOrientationCalled = false; - + EXPECT(HbToolBar, setOrientation).times(0); m_view->handleOrientationChange(Qt::Vertical); - QVERIFY( false == m_setOrientationCalled ); + QVERIFY(verify()); + reset(); // Reset mock framework + EXPECT(HbToolBar, setOrientation).times(1); m_view->handleOrientationChange(Qt::Horizontal); - QVERIFY( true == m_setOrientationCalled ); - + QVERIFY(verify()); } void TestPhoneUIQtView::testBackButtonClicked() @@ -363,46 +362,74 @@ void TestPhoneUIQtView::testShowDialpad() { + EXPECT(QGraphicsItem, isVisible).returns(true); + EXPECT(Dialpad, closeDialpad); m_view->hideDialpad(); - m_view->showDialpad(); + QVERIFY(verify()); + + EXPECT(QGraphicsItem, isVisible).returns(false); + EXPECT(Dialpad, openDialpad); m_view->showDialpad(); - QVERIFY(true == m_view->isDialpadVisible()); + QVERIFY(verify()); + + reset(); + EXPECT(QGraphicsItem, isVisible).returns(true); + EXPECT(Dialpad, openDialpad).times(0); + m_view->showDialpad(); + QVERIFY(verify()); + + EXPECT(Dialpad, closeDialpad); + EXPECT(QGraphicsItem, isVisible).returns(true); m_view->hideDialpad(); + QVERIFY(verify()); } void TestPhoneUIQtView::testDialpadText() { m_view->showDialpad(); m_view->clearDialpad(); - QVERIFY(QString("") == m_view->dialpadText()); + EXPECT(HbLineEdit, text).returns(QString("12345")); + QCOMPARE(m_view->dialpadText(), QString("12345")); m_view->clearAndHideDialpad(); + QVERIFY(verify()); } void TestPhoneUIQtView::testSetMenuActions() { - QList actions; + EXPECT(HbView, takeMenu); + QList actions; + QList retActions; + EXPECT(QGraphicsWidget, actions).returns(retActions).times(1); + m_view->setMenuActions(actions); + QVERIFY(verify()); + reset(); + + HbAction* action = new HbAction; + action->setText(QString("test")); + action->setProperty("command", 1); + actions.append(action); + + retActions.append(new HbAction); + EXPECT(HbView, takeMenu).times(0); + EXPECT(QGraphicsWidget, actions).returns(retActions).times(1); + m_view->setMenuActions(actions); + actions.clear(); + retActions.clear(); + QVERIFY(verify()); + reset(); + + EXPECT(HbView, takeMenu); + EXPECT(QGraphicsWidget, actions).returns(retActions).times(1); m_view->setMenuActions(actions); - QVERIFY(m_take_menu_called); - - PhoneAction* phoneAction = new PhoneAction; - phoneAction->setText(QString("test")); - phoneAction->setCommand(1); - actions.append(phoneAction); - - m_view->setMenuActions(actions); - qDeleteAll(actions); - actions.clear(); - - m_take_menu_called = false; - m_view->setMenuActions(actions); - QVERIFY(m_take_menu_called); + QVERIFY(verify()); + reset(); } //Private methods int TestPhoneUIQtView::createCallHeader () { - int bubble = m_view->bubbleManager().createCallHeader (); + int bubble = m_view->bubbleManager().createCallHeader(); return bubble; } @@ -421,16 +448,17 @@ void TestPhoneUIQtView::testNetworkNameChanged() { // Title is changed for GmsMode - m_view->networkNameChanged(QSystemNetworkInfo::GsmMode, QString("test")); - QCOMPARE(m_networkName, QString("test")); + EXPECT(HbView, setTitle).with(QString("test")); + m_view->m_priv->networkNameChanged(QSystemNetworkInfo::GsmMode, QString("test")); // Title is changed for WcdmaMode - m_view->networkNameChanged(QSystemNetworkInfo::WcdmaMode, QString("test2")); - QCOMPARE(m_networkName, QString("test2")); + EXPECT(HbView, setTitle).with(QString("test2")); + m_view->m_priv->networkNameChanged(QSystemNetworkInfo::WcdmaMode, QString("test2")); // Other modes shouldn't affect the title - m_view->networkNameChanged(QSystemNetworkInfo::CdmaMode, QString("another operator")); - QCOMPARE(m_networkName, QString("test2")); + EXPECT(HbView, setTitle).times(0); + m_view->m_priv->networkNameChanged(QSystemNetworkInfo::CdmaMode, QString("another operator")); + QVERIFY(verify()); } void TestPhoneUIQtView::testCaptureKey() @@ -453,54 +481,41 @@ QSignalSpy upSpy(m_view, SIGNAL(keyReleased(QKeyEvent*))); m_view->setRestrictedMode(true); - m_view->m_dialpad->editor().setText("1"); // emits signal - QCOMPARE(m_view->m_dialpad->isCallButtonEnabled(), false); - m_view->eventFilter(0, &oneDown); - m_view->eventFilter(0, &oneUp); - m_view->eventFilter(0, &yesDown); - m_view->eventFilter(0, &yesUp); + + EXPECT(HbLineEdit, text).returns(QString("1")).times(4); + EXPECT(Dialpad, setCallButtonEnabled).times(0); + EXPECT(Dialpad, isCallButtonEnabled).returns(false); + /*m_view->m_priv->onEditorContentChanged(); // Simulate signal + */ + m_view->m_priv->eventFilter(0, &oneDown); + m_view->m_priv->eventFilter(0, &oneUp); + m_view->m_priv->eventFilter(0, &yesDown); + m_view->m_priv->eventFilter(0, &yesUp); QCOMPARE(downSpy.count(), 1); // Only Key_1 is passed QCOMPARE(upSpy.count(), 1); // Only Key_1 is passed - QCOMPARE(m_view->m_dialpad->isCallButtonEnabled(), false); - QCOMPARE(m_view->m_backAction->isEnabled(), false); + QCOMPARE(m_view->m_priv->m_backAction->isEnabled(), false); // Test backbutton m_view->setBackButtonVisible(true); - QCOMPARE(m_view->m_backAction->isEnabled(), false); + QCOMPARE(m_view->m_priv->m_backAction->isEnabled(), false); // Test return to normal mode downSpy.clear(); upSpy.clear(); m_view->setRestrictedMode(false); - m_view->m_dialpad->editor().setText("1"); // emits signal - QCOMPARE(m_view->m_dialpad->isCallButtonEnabled(), true); - m_view->eventFilter(0, &oneDown); - m_view->eventFilter(0, &oneUp); - m_view->eventFilter(0, &yesDown); - m_view->eventFilter(0, &yesUp); + EXPECT(HbLineEdit, text).returns(QString("1")).times(5); + EXPECT(Dialpad, setCallButtonEnabled).with(true); + EXPECT(Dialpad, isCallButtonEnabled).returns(true).times(4); + m_view->m_priv->onEditorContentChanged(); // Simulate signal + m_view->m_priv->eventFilter(0, &oneDown); + m_view->m_priv->eventFilter(0, &oneUp); + m_view->m_priv->eventFilter(0, &yesDown); + m_view->m_priv->eventFilter(0, &yesUp); QCOMPARE(downSpy.count(), 2); QCOMPARE(upSpy.count(), 2); - QCOMPARE(m_view->m_dialpad->isCallButtonEnabled(), true); - QCOMPARE(m_view->m_backAction->isEnabled(), true); -} - -HbMenu * HbView::takeMenu() -{ - m_take_menu_called = true; - return 0; + QCOMPARE(m_view->m_priv->m_backAction->isEnabled(), true); } -void HbView::setMenu(HbMenu* menu) -{ - m_set_menu_called = true; -} - -void HbView::setTitle (const QString &title) -{ - m_networkName = title; -} - - PHONE_QT_VIEW_TEST_MAIN(TestPhoneUIQtView) Q_DECLARE_METATYPE(QKeyEvent *) #include "unit_tests.moc" diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/ut_phoneuiqtview.pro --- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/ut_phoneuiqtview.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/ut_phoneuiqtview.pro Fri Oct 15 12:58:46 2010 +0300 @@ -20,8 +20,8 @@ TARGET.UID3 = 0xEA9BEF3F DEPENDPATH += . ../../src/ INCLUDEPATH += . -CONFIG += hb qtestlib //mobility -//MOBILITY += systeminfo +CONFIG += hb qtestlib mobility +MOBILITY += systeminfo symbian { @@ -36,9 +36,10 @@ LIBS += -lbubblemanager2 \ -lxqserviceutil \ -ldialpad \ - -lxqkeycapture + -lxqkeycapture \ + -lmocklib \ + -lsymbianmock - DEFINES += FT_SYMBIAN_INTEGRATION } else:win32 { INCLUDEPATH += c:/hb/include/hbcore \ c:/hb/include/hbwidgets \ @@ -54,16 +55,32 @@ # Input HEADERS += ../../inc/phoneuiqtview.h \ ../../inc/phoneuiqtviewif.h \ - ../../inc/phoneaction.h \ - hbtoolbar.h \ - hbvolumesliderpopup.h \ - qsysteminfo.h + ../../inc/phoneuiqtview_p.h + SOURCES += ../../src/phoneuiqtview.cpp \ - ../../src/phoneaction.cpp \ + ../../src/phoneuiqtview_p.cpp \ unit_tests.cpp \ - hbtoolbar_stub.cpp \ - hbvolumesliderpopup_stub.cpp \ - qsysteminfo_stub.cpp + ../../../../tsrc/mocks/orbit/mock_hbaction.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbicon.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbmainwindow.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbview.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbwidget.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbwidgetbase.cpp \ + ../../../../tsrc/mocks/orbit/mock_hblineedit.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbabstractedit.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbtoolbar.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbvolumesliderpopup.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbsliderpopup.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbdialog.cpp \ + ../../../../tsrc/mocks/orbit/mock_hbpopup.cpp \ + ../../../../tsrc/mocks/qtgui/mock_qgraphicsview.cpp \ + ../../../../tsrc/mocks/qtgui/mock_qgraphicswidget.cpp \ + ../../../../tsrc/mocks/qtgui/mock_qgraphicsitem.cpp \ + ../../../../tsrc/mocks/bubblemanager/mock_bubblemanager2.cpp \ + ../../../../tsrc/mocks/qtmobility/mock_qsysteminfo.cpp \ + ../../../../tsrc/mocks/qtmobility/mock_xqkeycapture.cpp \ + ../../../../tsrc/mocks/phonesrv/mock_dialpad.cpp \ + ../../../../tsrc/mocks/phonesrv/mock_dialpadkeyhandler.cpp diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuivoipextension/src/cphonetransferdialercontroller.cpp --- a/phoneapp/phoneuivoipextension/src/cphonetransferdialercontroller.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuivoipextension/src/cphonetransferdialercontroller.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -218,14 +218,20 @@ switch( aCommandId ) { case EPhoneCmdTransferDialerOk: + { resourceId = R_VOIP_DIALER_TOOLTIP_ACCEPT; break; + } case EPhoneCmdTransferDialerSearch: + { resourceId = R_VOIP_DIALER_TOOLTIP_SEARCH; - break; + break; + } default: - tooltip = KNullDesC().Alloc(); - break; + { + User::Leave(KErrNotFound); + break; + } } if ( resourceId ) diff -r cfea66083b62 -r baacf668fe89 phoneengine/callhandling/src/cpecallarrayowner.cpp --- a/phoneengine/callhandling/src/cpecallarrayowner.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/callhandling/src/cpecallarrayowner.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -315,8 +315,10 @@ if( !GetCallObject( callId ) ) { call = CPESingleCall::NewL( aOwner ); + CleanupStack::PushL( call ); call->SetCallId( callId ); - iCallArray->Append( call ); + iCallArray->AppendL( call ); + CleanupStack::Pop(); break; } } diff -r cfea66083b62 -r baacf668fe89 phoneengine/networkhandlingstarter/src/main.cpp --- a/phoneengine/networkhandlingstarter/src/main.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/networkhandlingstarter/src/main.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -26,6 +26,7 @@ { HbApplication app(argc, argv, Hb::NoSplash); NetworkHandlingStarter service; + service.start(); XQServiceUtil::toBackground(true); return app.exec(); } diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonecntfinder2/src/cphcntfactoryimpl2.cpp --- a/phoneengine/phonecntfinder2/src/cphcntfactoryimpl2.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phonecntfinder2/src/cphcntfactoryimpl2.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -55,8 +55,6 @@ // CPhCntFactoryImpl2::~CPhCntFactoryImpl2() { - - FeatureManager::UnInitializeLib(); } @@ -136,7 +134,6 @@ // void CPhCntFactoryImpl2::ConstructL() { - FeatureManager::InitializeLibL(); } diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/inc/cpeparsersshandler.h --- a/phoneengine/phonemodel/inc/cpeparsersshandler.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phonemodel/inc/cpeparsersshandler.h Fri Oct 15 12:58:46 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -44,6 +44,7 @@ class PSetWrapper; class PsUiDivertNoteHandler; class PsUiWaitingNoteHandler; +class PsUiCliNoteHandler; // CLASS DECLARATION @@ -286,8 +287,10 @@ // Owned call barring. CPsetCallBarring* iBarring; - // Owned calling line identity. + // Calling line identity. Not own. CPsetCli* iCli; + // Calling line identity note handler. Own. + PsUiCliNoteHandler* iCliNoteHandler; // Call diverting. Not own. CPsetCallDiverting* iDivert; diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/inc/cpephonemodel.h --- a/phoneengine/phonemodel/inc/cpephonemodel.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phonemodel/inc/cpephonemodel.h Fri Oct 15 12:58:46 2010 +0300 @@ -76,8 +76,7 @@ EPELogHandlingPhaseTwo, EPEContactHandlingPhaseTwo, EPEMediatorCommandHandler, - EPEPhoneServices, - EPENetworkHandling + EPEPhoneServices }; /** diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/phonemodel.pro --- a/phoneengine/phonemodel/phonemodel.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phonemodel/phonemodel.pro Fri Oct 15 12:58:46 2010 +0300 @@ -76,8 +76,6 @@ -lengineinfo \ -lmediatorclient \ -lestor \ - -lxqservice \ - -lxqserviceutil \ -llibglib \ -lpsetwrapper \ -lpsuinotes diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/src/cpeparsersshandler.cpp --- a/phoneengine/phonemodel/src/cpeparsersshandler.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phonemodel/src/cpeparsersshandler.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -39,7 +39,9 @@ #include #include #include +#include #include +#include // CONSTANTS const TInt KPEDefinedBasicServiceGroup = 99; @@ -87,12 +89,12 @@ // Destructor CPEParserSSHandler::~CPEParserSSHandler() { - delete iCli; delete iBarring; - delete iWaiting; delete iSettings; delete iCallDivertingHandler; + delete iCallWaitingHandler; + delete iCliNoteHandler; delete iPsetWrapper; @@ -964,9 +966,7 @@ // ----------------------------------------------------------------------------- // void CPEParserSSHandler::CreateCWObsL() - { - ConnectToSsEngineL(); - + { if ( !iPsetWrapper ) { iPsetWrapper = new PSetWrapper; @@ -1008,7 +1008,13 @@ // void CPEParserSSHandler::CreateCliObsL() { - ConnectToSsEngineL(); + if ( !iPsetWrapper ) + { + iPsetWrapper = new PSetWrapper; + iCliNoteHandler = new PsUiCliNoteHandler(iPsetWrapper->cliWrapper()); + iCli = &iPsetWrapper->cliWrapper().getCPsetCli(); + iCli->SetRequestObserver(this); + } } // ----------------------------------------------------------------------------- @@ -1051,8 +1057,6 @@ delete iBarring; iBarring = NULL; - delete iCli; - iCli = NULL; delete iSettings; iSettings = NULL; @@ -1064,6 +1068,10 @@ delete iCallWaitingHandler; iCallWaitingHandler = NULL; + iCli = NULL; + delete iCliNoteHandler; + iCliNoteHandler = NULL; + delete iPsetWrapper; iPsetWrapper = NULL; } diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/src/cpephonemodel.cpp --- a/phoneengine/phonemodel/src/cpephonemodel.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phonemodel/src/cpephonemodel.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -38,8 +38,6 @@ #include #include #include -#include -#include #include "phoneservices.h" // CONSTANTS @@ -1406,36 +1404,7 @@ __ASSERT_DEBUG( iEngineInfo, Panic( EPEPanicNullPointer ) ); iPhoneServices = new PhoneServices(*iMessageHandler, *iEngineInfo); TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::StepL: 16.2" ); - break; - } - - case CPEPhoneModel::EPENetworkHandling: - { - TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::StepL: 18.1" ); continueStepping = EFalse; - QString service("networkhandlingstarter"); - QString interface("com.nokia.symbian.IStart"); - QString operation("start()"); - XQApplicationManager appManager; - - QScopedPointer request( - appManager.create(service, interface, operation, false)); - if (request == NULL) { - TEFLOGSTRING(KTAOBJECT, - "CPEPhoneModel::StepL 18.2 error, service not found"); - break; - } - XQRequestInfo info; - info.setForeground(false); - request->setInfo(info); - request->setSynchronous(false); - if (!request->send()) { - int error = request->lastError(); - TEFLOGSTRING2(KTAOBJECT, - "CPEPhoneModel::StepL 18.3 error %d", error); - break; - } - TEFLOGSTRING(KTAOBJECT, "CPEPhoneModel::StepL: 18.4"); break; } diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/tsrc/ut_penetworkhandler/bld.inf --- a/phoneengine/phonemodel/tsrc/ut_penetworkhandler/bld.inf Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -// ============================================================================ -// * Makefile for building: ut_penetworkhandler -// * Generated by qmake (2.01a) (Qt 4.7.0) on: 2010-08-26T13:06:43 -// * This file is generated by qmake and should not be modified by the -// * user. -// * Project: ut_penetworkhandler.pro -// * Template: app -// ============================================================================ - -#define BLD_INF_UT_PENETWORKHANDLER_0987D1D8 - - -prj_platforms - -WINSCW GCCE ARMV5 ARMV6 - - -prj_mmpfiles - -ut_penetworkhandler_0xEA9BEFAA.mmp - -prj_extensions - -START EXTENSION qt/qmake_extra_pre_targetdep.export -OPTION PREDEP_TARGET Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/moc_penetworkhandler.cpp -OPTION DEPS Q:/sf/app/phone/phoneengine/phonemodel/inc/mpephonemodelinternal.h Q:/sf/app/phone/phoneengine/phonemodel/inc/penetworkhandler.h -OPTION COMMAND /epoc32/tools/moc.exe -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DHB_HAVE_QT_MOBILITY -DHB_EFFECTS_OPENVG -DHB_FILTER_EFFECTS -DHB_HAVE_PROTECTED_CHUNK -DHB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -DHB_GESTURE_FW -DHB_EFFECTS -DHB_TEXT_MEASUREMENT_UTILITY -DHB_HAVE_QT_MOBILITY -DHB_EFFECTS_OPENVG -DHB_FILTER_EFFECTS -DHB_HAVE_PROTECTED_CHUNK -DHB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -DHB_GESTURE_FW -DHB_EFFECTS -DHB_TEXT_MEASUREMENT_UTILITY -DQT_SVG_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I"Q:/epoc32/include/mw/QtCore" -I"Q:/epoc32/include/mw/QtNetwork" -I"Q:/epoc32/include/mw/QtGui" -I"Q:/epoc32/include/mw/QtSvg" -I"Q:/epoc32/include/mw" -I"Q:/epoc32/include/mw/QtTest" -I"Q:/sf/mw/qt/mkspecs/common/symbian" -I"Q:/epoc32/include" -I"Q:/epoc32/include/stdapis" -I"Q:/epoc32/include/stdapis/sys" -I"Q:/epoc32/include/platform/mw" -I"Q:/epoc32/include/platform" -I"Q:/epoc32/include/platform/loc" -I"Q:/epoc32/include/platform/mw/loc" -I"Q:/epoc32/include/platform/loc/sc" -I"Q:/epoc32/include/platform/mw/loc/sc" -I"Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler" -I"Q:/epoc32/include/platform/app" -I"Q:/sf/app/phone/phoneengine/inc" -I"Q:/sf/app/phone/inc" -I"Q:/sf/app/phone/engineinfo/inc" -I"Q:/epoc32/include/mw/hb/hbcore" -I"Q:/epoc32/include/mw/hb/hbwidgets" -I"Q:/epoc32/include/mw/hb/hbutils" -I"Q:/epoc32/include/stdapis/stlportv5" -I"Q:/sf/app/phone/phoneengine/phonemodel/inc" -I"Q:/sf/app/phone/phoneengine/phonemodel/src" -DSYMBIAN q:/sf/app/phone/phoneengine/phonemodel/inc/penetworkhandler.h -o q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/moc_penetworkhandler.cpp -END -START EXTENSION qt/qmake_extra_pre_targetdep.export -OPTION PREDEP_TARGET Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/unit_tests.moc -OPTION DEPS Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/unit_tests.cpp -OPTION COMMAND /epoc32/tools/moc.exe -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DHB_HAVE_QT_MOBILITY -DHB_EFFECTS_OPENVG -DHB_FILTER_EFFECTS -DHB_HAVE_PROTECTED_CHUNK -DHB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -DHB_GESTURE_FW -DHB_EFFECTS -DHB_TEXT_MEASUREMENT_UTILITY -DHB_HAVE_QT_MOBILITY -DHB_EFFECTS_OPENVG -DHB_FILTER_EFFECTS -DHB_HAVE_PROTECTED_CHUNK -DHB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -DHB_GESTURE_FW -DHB_EFFECTS -DHB_TEXT_MEASUREMENT_UTILITY -DQT_SVG_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I"Q:/epoc32/include/mw/QtCore" -I"Q:/epoc32/include/mw/QtNetwork" -I"Q:/epoc32/include/mw/QtGui" -I"Q:/epoc32/include/mw/QtSvg" -I"Q:/epoc32/include/mw" -I"Q:/epoc32/include/mw/QtTest" -I"Q:/sf/mw/qt/mkspecs/common/symbian" -I"Q:/epoc32/include" -I"Q:/epoc32/include/stdapis" -I"Q:/epoc32/include/stdapis/sys" -I"Q:/epoc32/include/platform/mw" -I"Q:/epoc32/include/platform" -I"Q:/epoc32/include/platform/loc" -I"Q:/epoc32/include/platform/mw/loc" -I"Q:/epoc32/include/platform/loc/sc" -I"Q:/epoc32/include/platform/mw/loc/sc" -I"Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler" -I"Q:/epoc32/include/platform/app" -I"Q:/sf/app/phone/phoneengine/inc" -I"Q:/sf/app/phone/inc" -I"Q:/sf/app/phone/engineinfo/inc" -I"Q:/epoc32/include/mw/hb/hbcore" -I"Q:/epoc32/include/mw/hb/hbwidgets" -I"Q:/epoc32/include/mw/hb/hbutils" -I"Q:/epoc32/include/stdapis/stlportv5" -I"Q:/sf/app/phone/phoneengine/phonemodel/inc" -I"Q:/sf/app/phone/phoneengine/phonemodel/src" -DSYMBIAN q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/unit_tests.cpp -o q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/unit_tests.moc -END - -#if defined(WINSCW) -#endif - -START EXTENSION qt/qmake_store_build -END - - diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/tsrc/ut_penetworkhandler/ctcerr.txt --- a/phoneengine/phonemodel/tsrc/ut_penetworkhandler/ctcerr.txt Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,844 +0,0 @@ - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwldsym2.exe -argv[1]: -version - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwldsym2 -version -*** CTC++/ctcagent command status: 0 - - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwccsym2.exe -argv[1]: -version - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 -version -*** CTC++/ctcagent command status: 0 - - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwccsym2.exe -argv[1]: -c -argv[2]: -align -argv[3]: 4 -argv[4]: -warnings -argv[5]: on -argv[6]: -w -argv[7]: nohidevirtual,nounusedexpr -argv[8]: -msgstyle -argv[9]: gcc -argv[10]: -enum -argv[11]: int -argv[12]: -str -argv[13]: pool -argv[14]: -exc -argv[15]: ms -argv[16]: -trigraphs -argv[17]: on -argv[18]: -cwd -argv[19]: source -argv[20]: -g -argv[21]: -O0 -argv[22]: -inline -argv[23]: off -argv[24]: -runtime -argv[25]: staticmulti -argv[26]: -wchar_t -argv[27]: on -argv[28]: -nostdinc -argv[29]: -gccdepends -argv[30]: -MD -argv[31]: -cwd -argv[32]: include -argv[33]: -wchar_t -argv[34]: on -argv[35]: -d -argv[36]: __wchar_t_defined -argv[37]: -d -argv[38]: __SYMBIAN32__ -argv[39]: -d -argv[40]: __CW32__ -argv[41]: -d -argv[42]: __WINS__ -argv[43]: -d -argv[44]: __WINSCW__ -argv[45]: -d -argv[46]: __SUPPORT_CPP_EXCEPTIONS__ -argv[47]: -d -argv[48]: _UNICODE -argv[49]: -d -argv[50]: UNICODE -argv[51]: -d -argv[52]: QT_KEYPAD_NAVIGATION -argv[53]: -d -argv[54]: QT_SOFTKEYS_ENABLED -argv[55]: -d -argv[56]: QT_USE_MATH_H_FLOATS -argv[57]: -d -argv[58]: HB_HAVE_QT_MOBILITY -argv[59]: -d -argv[60]: HB_EFFECTS_OPENVG -argv[61]: -d -argv[62]: HB_FILTER_EFFECTS -argv[63]: -d -argv[64]: HB_HAVE_PROTECTED_CHUNK -argv[65]: -d -argv[66]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[67]: -d -argv[68]: HB_GESTURE_FW -argv[69]: -d -argv[70]: HB_EFFECTS -argv[71]: -d -argv[72]: HB_TEXT_MEASUREMENT_UTILITY -argv[73]: -d -argv[74]: HB_HAVE_QT_MOBILITY -argv[75]: -d -argv[76]: HB_EFFECTS_OPENVG -argv[77]: -d -argv[78]: HB_FILTER_EFFECTS -argv[79]: -d -argv[80]: HB_HAVE_PROTECTED_CHUNK -argv[81]: -d -argv[82]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[83]: -d -argv[84]: HB_GESTURE_FW -argv[85]: -d -argv[86]: HB_EFFECTS -argv[87]: -d -argv[88]: HB_TEXT_MEASUREMENT_UTILITY -argv[89]: -d -argv[90]: QT_SVG_LIB -argv[91]: -d -argv[92]: QT_GUI_LIB -argv[93]: -d -argv[94]: QT_NETWORK_LIB -argv[95]: -d -argv[96]: QT_CORE_LIB -argv[97]: -d -argv[98]: _DEBUG -argv[99]: -d -argv[100]: __SYMBIAN_STDCPP_SUPPORT__ -argv[101]: -d -argv[102]: __EXE__ -argv[103]: -i- -argv[104]: -i -argv[105]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[106]: -i -argv[107]: Q:/epoc32/include/mw/QtCore -argv[108]: -i -argv[109]: Q:/epoc32/include/mw/QtNetwork -argv[110]: -i -argv[111]: Q:/epoc32/include/mw/QtGui -argv[112]: -i -argv[113]: Q:/epoc32/include/mw/QtSvg -argv[114]: -i -argv[115]: Q:/epoc32/include/mw -argv[116]: -i -argv[117]: Q:/epoc32/include/mw/QtTest -argv[118]: -i -argv[119]: Q:/sf/mw/qt/mkspecs/common/symbian -argv[120]: -i -argv[121]: Q:/epoc32/include -argv[122]: -i -argv[123]: Q:/epoc32/include/stdapis -argv[124]: -i -argv[125]: Q:/epoc32/include/stdapis/sys -argv[126]: -i -argv[127]: Q:/epoc32/include/platform/mw -argv[128]: -i -argv[129]: Q:/epoc32/include/platform -argv[130]: -i -argv[131]: Q:/epoc32/include/platform/loc -argv[132]: -i -argv[133]: Q:/epoc32/include/platform/mw/loc -argv[134]: -i -argv[135]: Q:/epoc32/include/platform/loc/sc -argv[136]: -i -argv[137]: Q:/epoc32/include/platform/mw/loc/sc -argv[138]: -i -argv[139]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[140]: -i -argv[141]: Q:/epoc32/include/platform/app -argv[142]: -i -argv[143]: Q:/sf/app/phone/phoneengine/inc -argv[144]: -i -argv[145]: Q:/sf/app/phone/inc -argv[146]: -i -argv[147]: Q:/sf/app/phone/engineinfo/inc -argv[148]: -i -argv[149]: Q:/epoc32/include/mw/hb/hbcore -argv[150]: -i -argv[151]: Q:/epoc32/include/mw/hb/hbwidgets -argv[152]: -i -argv[153]: Q:/epoc32/include/mw/hb/hbutils -argv[154]: -i -argv[155]: Q:/epoc32/include/stdapis/stlportv5 -argv[156]: -i -argv[157]: Q:/sf/app/phone/phoneengine/phonemodel/inc -argv[158]: -i -argv[159]: Q:/sf/app/phone/phoneengine/phonemodel/src -argv[160]: -i -argv[161]: Q:/epoc32/include -argv[162]: -i -argv[163]: Q:/epoc32/include/stdapis -argv[164]: -include -argv[165]: feature_settings.hrh -argv[166]: -o -argv[167]: Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb/ut_penetworkhandler_UID_.o -argv[168]: Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_edler.cpp - -xe/winscw/udeb/ut_penetworkhandler.UID.CPP - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-20036.rsp -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-21672.rsp -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-20108.rsp - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwccsym2.exe -argv[1]: -c -argv[2]: -align -argv[3]: 4 -argv[4]: -warnings -argv[5]: on -argv[6]: -w -argv[7]: nohidevirtual,nounusedexpr -argv[8]: -msgstyle -argv[9]: gcc -argv[10]: -enum -argv[11]: int -argv[12]: -str -argv[13]: pool -argv[14]: -exc -argv[15]: ms -argv[16]: -trigraphs -argv[17]: on -argv[18]: -cwd -argv[19]: source -argv[20]: -g -argv[21]: -O0 -argv[22]: -inline -argv[23]: off -argv[24]: -runtime -argv[25]: staticmulti -argv[26]: -wchar_t -argv[27]: on -argv[28]: -nostdinc -argv[29]: -gccdepends -argv[30]: -MD -argv[31]: -cwd -argv[32]: include -argv[33]: -wchar_t -argv[34]: on -argv[35]: -d -argv[36]: __wchar_t_defined -argv[37]: -d -argv[38]: __SYMBIAN32__ -argv[39]: -d -argv[40]: __CW32__ -argv[41]: -d -argv[42]: __WINS__ -argv[43]: -d -argv[44]: __WINSCW__ -argv[45]: -d -argv[46]: __SUPPORT_CPP_EXCEPTIONS__ -argv[47]: -d -argv[48]: _UNICODE -argv[49]: -d -argv[50]: UNICODE -argv[51]: -d -argv[52]: QT_KEYPAD_NAVIGATION -argv[53]: -d -argv[54]: QT_SOFTKEYS_ENABLED -argv[55]: -d -argv[56]: QT_USE_MATH_H_FLOATS -argv[57]: -d -argv[58]: HB_HAVE_QT_MOBILITY -argv[59]: -d -argv[60]: HB_EFFECTS_OPENVG -argv[61]: -d -argv[62]: HB_FILTER_EFFECTS -argv[63]: -d -argv[64]: HB_HAVE_PROTECTED_CHUNK -argv[65]: -d -argv[66]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[67]: -d -argv[68]: HB_GESTURE_FW -argv[69]: -d -argv[70]: HB_EFFECTS -argv[71]: -d -argv[72]: HB_TEXT_MEASUREMENT_UTILITY -argv[73]: -d -argv[74]: HB_HAVE_QT_MOBILITY -argv[75]: -d -argv[76]: HB_EFFECTS_OPENVG -argv[77]: -d -argv[78]: HB_FILTER_EFFECTS -argv[79]: -d -argv[80]: HB_HAVE_PROTECTED_CHUNK -argv[81]: -d -argv[82]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[83]: -d -argv[84]: HB_GESTURE_FW -argv[85]: -d -argv[86]: HB_EFFECTS -argv[87]: -d -argv[88]: HB_TEXT_MEASUREMENT_UTILITY -argv[89]: -d -argv[90]: QT_SVG_LIB -argv[91]: -d -argv[92]: QT_GUI_LIB -argv[93]: -d -argv[94]: QT_NETWORK_LIB -argv[95]: -d -argv[96]: QT_CORE_LIB -argv[97]: -d -argv[98]: _DEBUG -argv[99]: -d -argv[100]: __SYMBIAN_STDCPP_SUPPORT__ -argv[101]: -d -argv[102]: __EXE__ -argv[103]: -i- -argv[104]: -i -argv[105]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[106]: -i -argv[107]: Q:/epoc32/include/mw/QtCore -argv[108]: -i -argv[109]: Q:/epoc32/include/mw/QtNetwork -argv[110]: -i -argv[111]: Q:/epoc32/include/mw/QtGui -argv[112]: -i -argv[113]: Q:/epoc32/include/mw/QtSvg -argv[114]: -i -argv[115]: Q:/epoc32/include/mw -argv[116]: -i -argv[117]: Q:/epoc32/include/mw/QtTest -argv[118]: -i -argv[119]: Q:/sf/mw/qt/mkspecs/common/symbian -argv[120]: -i -argv[121]: Q:/epoc32/include -argv[122]: -i -argv[123]: Q:/epoc32/include/stdapis -argv[124]: -i -argv[125]: Q:/epoc32/include/stdapis/sys -argv[126]: -i -argv[127]: Q:/epoc32/include/platform/mw -argv[128]: -i -argv[129]: Q:/epoc32/include/platform -argv[130]: -i -argv[131]: Q:/epoc32/include/platform/loc -argv[132]: -i -argv[133]: Q:/epoc32/include/platform/mw/loc -argv[134]: -i -argv[135]: Q:/epoc32/include/platform/loc/sc -argv[136]: -i -argv[137]: Q:/epoc32/include/platform/mw/loc/sc -argv[138]: -i -argv[139]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[140]: -i -argv[141]: Q:/epoc32/include/platform/app -argv[142]: -i -argv[143]: Q:/sf/app/phone/phoneengine/inc -argv[144]: -i -argv[145]: Q:/sf/app/phone/inc -argv[146]: -i -argv[147]: Q:/sf/app/phone/engineinfo/inc -argv[148]: -i -argv[149]: Q:/epoc32/include/mw/hb/hbcore -argv[150]: -i -argv[151]: Q:/epoc32/include/mw/hb/hbwidgets -argv[152]: -i -argv[153]: Q:/epoc32/include/mw/hb/hbutils -argv[154]: -i -argv[155]: Q:/epoc32/include/stdapis/stlportv5 -argv[156]: -i -argv[157]: Q:/sf/app/phone/phoneengine/phonemodel/inc -argv[158]: -i -argv[159]: Q:/sf/app/phone/phoneengine/phonemodel/src -argv[160]: -i -argv[161]: Q:/epoc32/include -argv[162]: -i -argv[163]: Q:/epoc32/include/stdapis -argv[164]: -include -argv[165]: feature_settings.hrh -argv[166]: -o -argv[167]: Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb/unit_tests.o -argv[168]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/unit_tests.cpp - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-20788.rsp -*** CTC++/ctcagent command status: 0 - -*** CTC++/ctcagent command status: 0 - -*** CTC++/ctcagent command status: 0 - -*** CTC++/ctcagent command status: 0 - - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwldsym2.exe -argv[1]: -msgstyle -argv[2]: gcc -argv[3]: -stdlib -argv[4]: -subsystem -argv[5]: windows -argv[6]: -g -argv[7]: -heapreserve=8192 -argv[8]: -heapcommit=128 -argv[9]: -m -argv[10]: ?_E32Bootstrap@@YGXXZ -argv[11]: Q:/epoc32/release/winscw/udeb/eexe.lib -argv[12]: Q:/epoc32/release/winscw/udeb/qtmain.lib -argv[13]: Q:/epoc32/release/winscw/udeb/QtSystemInfo.lib -argv[14]: Q:/epoc32/release/winscw/udeb/engineinfo.lib -argv[15]: Q:/epoc32/release/winscw/udeb/QtTest.lib -argv[16]: Q:/epoc32/release/winscw/udeb/HbCore.lib -argv[17]: Q:/epoc32/release/winscw/udeb/HbWidgets.lib -argv[18]: Q:/epoc32/release/winscw/udeb/HbUtils.lib -argv[19]: Q:/epoc32/release/winscw/udeb/libstdcppv5.lib -argv[20]: Q:/epoc32/release/winscw/udeb/QtSvg.lib -argv[21]: Q:/epoc32/release/winscw/udeb/QtGui.lib -argv[22]: Q:/epoc32/release/winscw/udeb/QtNetwork.lib -argv[23]: Q:/epoc32/release/winscw/udeb/QtCore.lib -argv[24]: Q:/epoc32/release/winscw/udeb/libpthread.lib -argv[25]: Q:/epoc32/release/winscw/udeb/libc.lib -argv[26]: Q:/epoc32/release/winscw/udeb/libm.lib -argv[27]: Q:/epoc32/release/winscw/udeb/euser.lib -argv[28]: Q:/epoc32/release/winscw/udeb/libdl.lib -argv[29]: -o -argv[30]: Q:/epoc32/release/winscw/udeb/ut_penetworkhandler.exe -argv[31]: -noimplib -argv[32]: -l -argv[33]: Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb -argv[34]: -search -argv[35]: @Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb/ut_penetworkhandler_udeb_objects.lrf - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwldsym2 @ctc-mwldsym2-19660.rsp -*** CTC++/ctcagent command status: 0 - - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwldsym2.exe -argv[1]: -version - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwldsym2 -version -*** CTC++/ctcagent command status: 0 - - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwccsym2.exe -argv[1]: -version - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 -version -*** CTC++/ctcagent command status: 0 - - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwccsym2.exe -argv[1]: -c -argv[2]: -align -argv[3]: 4 -argv[4]: -warnings -argv[5]: on -argv[6]: -w -argv[7]: nohidevirtual,nounusedexpr -argv[8]: -msgstyle -argv[9]: gcc -argv[10]: -enum -argv[11]: int -argv[12]: -str -argv[13]: pool -argv[14]: -exc -argv[15]: ms -argv[16]: -trigraphs -argv[17]: on -argv[18]: -cwd -argv[19]: source -argv[20]: -g -argv[21]: -O0 -argv[22]: -inline -argv[23]: off -argv[24]: -runtime -argv[25]: staticmulti -argv[26]: -wchar_t -argv[27]: on -argv[28]: -nostdinc -argv[29]: -gccdepends -argv[30]: -MD -argv[31]: -cwd -argv[32]: include -argv[33]: -wchar_t -argv[34]: on -argv[35]: -d -argv[36]: __wchar_t_defined -argv[37]: -d -argv[38]: __SYMBIAN32__ -argv[39]: -d -argv[40]: __CW32__ -argv[41]: -d -argv[42]: __WINS__ -argv[43]: -d -argv[44]: __WINSCW__ -argv[45]: -d -argv[46]: __SUPPORT_CPP_EXCEPTIONS__ -argv[47]: -d -argv[48]: _UNICODE -argv[49]: -d -argv[50]: UNICODE -argv[51]: -d -argv[52]: QT_KEYPAD_NAVIGATION -argv[53]: -d -argv[54]: QT_SOFTKEYS_ENABLED -argv[55]: -d -argv[56]: QT_USE_MATH_H_FLOATS -argv[57]: -d -argv[58]: HB_HAVE_QT_MOBILITY -argv[59]: -d -argv[60]: HB_EFFECTS_OPENVG -argv[61]: -d -argv[62]: HB_FILTER_EFFECTS -argv[63]: -d -argv[64]: HB_HAVE_PROTECTED_CHUNK -argv[65]: -d -argv[66]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[67]: -d -argv[68]: HB_GESTURE_FW -argv[69]: -d -argv[70]: HB_EFFECTS -argv[71]: -d -argv[72]: HB_TEXT_MEASUREMENT_UTILITY -argv[73]: -d -argv[74]: HB_HAVE_QT_MOBILITY -argv[75]: -d -argv[76]: HB_EFFECTS_OPENVG -argv[77]: -d -argv[78]: HB_FILTER_EFFECTS -argv[79]: -d -argv[80]: HB_HAVE_PROTECTED_CHUNK -argv[81]: -d -argv[82]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[83]: -d -argv[84]: HB_GESTURE_FW -argv[85]: -d -argv[86]: HB_EFFECTS -argv[87]: -d -argv[88]: HB_TEXT_MEASUREMENT_UTILITY -argv[89]: -d -argv[90]: QT_SVG_LIB -argv[91]: -d -argv[92]: QT_GUI_LIB -argv[93]: -d -argv[94]: QT_NETWORK_LIB -argv[95]: -d -argv[96]: QT_CORE_LIB -argv[97]: -d -argv[98]: _DEBUG -argv[99]: -d -argv[100]: __SYMBIAN_STDCPP_SUPPORT__ -argv[101]: -d -argv[102]: __EXE__ -argv[103]: -i- -argv[104]: -i -argv[105]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[106]: -i -argv[107]: Q:/epoc32/include/mw/QtCore -argv[108]: -i -argv[109]: Q:/epoc32/include/mw/QtNetwork -argv[110]: -i -argv[111]: Q:/epoc32/include/mw/QtGui -argv[112]: -i -argv[113]: Q:/epoc32/include/mw/QtSvg -argv[114]: -i -argv[115]: Q:/epoc32/include/mw -argv[116]: -i -argv[117]: Q:/epoc32/include/mw/QtTest -argv[118]: -i -argv[119]: Q:/sf/mw/qt/mkspecs/common/symbian -argv[120]: -i -argv[121]: Q:/epoc32/include -argv[122]: -i -argv[123]: Q:/epoc32/include/stdapis -argv[124]: -i -argv[125]: Q:/epoc32/include/stdapis/sys -argv[126]: -i -argv[127]: Q:/epoc32/include/platform/mw -argv[128]: -i -argv[129]: Q:/epoc32/include/platform -argv[130]: -i -argv[131]: Q:/epoc32/include/platform/loc -argv[132]: -i -argv[133]: Q:/epoc32/include/platform/mw/loc -argv[134]: -i -argv[135]: Q:/epoc32/include/platform/loc/sc -argv[136]: -i -argv[137]: Q:/epoc32/include/platform/mw/loc/sc -argv[138]: -i -argv[139]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[140]: -i -argv[141]: Q:/epoc32/include/platform/app -argv[142]: -i -argv[143]: Q:/sf/app/phone/phoneengine/inc -argv[144]: -i -argv[145]: Q:/sf/app/phone/inc -argv[146]: -i -argv[147]: Q:/sf/app/phone/engineinfo/inc -argv[148]: -i -argv[149]: Q:/epoc32/include/mw/hb/hbcore -argv[150]: -i -argv[151]: Q:/epoc32/include/mw/hb/hbwidgets -argv[152]: -i -argv[153]: Q:/epoc32/include/mw/hb/hbutils -argv[154]: -i -argv[155]: Q:/epoc32/include/stdapis/stlportv5 -argv[156]: -i -argv[157]: Q:/sf/app/phone/phoneengine/phonemodel/inc -argv[158]: -i -argv[159]: Q:/sf/app/phone/phoneengine/phonemodel/src -argv[160]: -i -argv[161]: Q:/epoc32/include -argv[162]: -i -argv[163]: Q:/epoc32/include/stdapis -argv[164]: -include -argv[165]: feature_settings.hrh -argv[166]: -o -argv[167]: Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb/penetworkhandler.o -argv[168]: Q:/sf/app/phone/phoneengine/phonemodel/src/penetworkhandler.cpp - -enetworkhandler_edler.cpp - -xe/winscw/udeb/ut_penetworkhandler.UID.CPP - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-25540.rsp -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-23408.rsp -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-24688.rsp - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwccsym2.exe -argv[1]: -c -argv[2]: -align -argv[3]: 4 -argv[4]: -warnings -argv[5]: on -argv[6]: -w -argv[7]: nohidevirtual,nounusedexpr -argv[8]: -msgstyle -argv[9]: gcc -argv[10]: -enum -argv[11]: int -argv[12]: -str -argv[13]: pool -argv[14]: -exc -argv[15]: ms -argv[16]: -trigraphs -argv[17]: on -argv[18]: -cwd -argv[19]: source -argv[20]: -g -argv[21]: -O0 -argv[22]: -inline -argv[23]: off -argv[24]: -runtime -argv[25]: staticmulti -argv[26]: -wchar_t -argv[27]: on -argv[28]: -nostdinc -argv[29]: -gccdepends -argv[30]: -MD -argv[31]: -cwd -argv[32]: include -argv[33]: -wchar_t -argv[34]: on -argv[35]: -d -argv[36]: __wchar_t_defined -argv[37]: -d -argv[38]: __SYMBIAN32__ -argv[39]: -d -argv[40]: __CW32__ -argv[41]: -d -argv[42]: __WINS__ -argv[43]: -d -argv[44]: __WINSCW__ -argv[45]: -d -argv[46]: __SUPPORT_CPP_EXCEPTIONS__ -argv[47]: -d -argv[48]: _UNICODE -argv[49]: -d -argv[50]: UNICODE -argv[51]: -d -argv[52]: QT_KEYPAD_NAVIGATION -argv[53]: -d -argv[54]: QT_SOFTKEYS_ENABLED -argv[55]: -d -argv[56]: QT_USE_MATH_H_FLOATS -argv[57]: -d -argv[58]: HB_HAVE_QT_MOBILITY -argv[59]: -d -argv[60]: HB_EFFECTS_OPENVG -argv[61]: -d -argv[62]: HB_FILTER_EFFECTS -argv[63]: -d -argv[64]: HB_HAVE_PROTECTED_CHUNK -argv[65]: -d -argv[66]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[67]: -d -argv[68]: HB_GESTURE_FW -argv[69]: -d -argv[70]: HB_EFFECTS -argv[71]: -d -argv[72]: HB_TEXT_MEASUREMENT_UTILITY -argv[73]: -d -argv[74]: HB_HAVE_QT_MOBILITY -argv[75]: -d -argv[76]: HB_EFFECTS_OPENVG -argv[77]: -d -argv[78]: HB_FILTER_EFFECTS -argv[79]: -d -argv[80]: HB_HAVE_PROTECTED_CHUNK -argv[81]: -d -argv[82]: HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -argv[83]: -d -argv[84]: HB_GESTURE_FW -argv[85]: -d -argv[86]: HB_EFFECTS -argv[87]: -d -argv[88]: HB_TEXT_MEASUREMENT_UTILITY -argv[89]: -d -argv[90]: QT_SVG_LIB -argv[91]: -d -argv[92]: QT_GUI_LIB -argv[93]: -d -argv[94]: QT_NETWORK_LIB -argv[95]: -d -argv[96]: QT_CORE_LIB -argv[97]: -d -argv[98]: _DEBUG -argv[99]: -d -argv[100]: __SYMBIAN_STDCPP_SUPPORT__ -argv[101]: -d -argv[102]: __EXE__ -argv[103]: -i- -argv[104]: -i -argv[105]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[106]: -i -argv[107]: Q:/epoc32/include/mw/QtCore -argv[108]: -i -argv[109]: Q:/epoc32/include/mw/QtNetwork -argv[110]: -i -argv[111]: Q:/epoc32/include/mw/QtGui -argv[112]: -i -argv[113]: Q:/epoc32/include/mw/QtSvg -argv[114]: -i -argv[115]: Q:/epoc32/include/mw -argv[116]: -i -argv[117]: Q:/epoc32/include/mw/QtTest -argv[118]: -i -argv[119]: Q:/sf/mw/qt/mkspecs/common/symbian -argv[120]: -i -argv[121]: Q:/epoc32/include -argv[122]: -i -argv[123]: Q:/epoc32/include/stdapis -argv[124]: -i -argv[125]: Q:/epoc32/include/stdapis/sys -argv[126]: -i -argv[127]: Q:/epoc32/include/platform/mw -argv[128]: -i -argv[129]: Q:/epoc32/include/platform -argv[130]: -i -argv[131]: Q:/epoc32/include/platform/loc -argv[132]: -i -argv[133]: Q:/epoc32/include/platform/mw/loc -argv[134]: -i -argv[135]: Q:/epoc32/include/platform/loc/sc -argv[136]: -i -argv[137]: Q:/epoc32/include/platform/mw/loc/sc -argv[138]: -i -argv[139]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler -argv[140]: -i -argv[141]: Q:/epoc32/include/platform/app -argv[142]: -i -argv[143]: Q:/sf/app/phone/phoneengine/inc -argv[144]: -i -argv[145]: Q:/sf/app/phone/inc -argv[146]: -i -argv[147]: Q:/sf/app/phone/engineinfo/inc -argv[148]: -i -argv[149]: Q:/epoc32/include/mw/hb/hbcore -argv[150]: -i -argv[151]: Q:/epoc32/include/mw/hb/hbwidgets -argv[152]: -i -argv[153]: Q:/epoc32/include/mw/hb/hbutils -argv[154]: -i -argv[155]: Q:/epoc32/include/stdapis/stlportv5 -argv[156]: -i -argv[157]: Q:/sf/app/phone/phoneengine/phonemodel/inc -argv[158]: -i -argv[159]: Q:/sf/app/phone/phoneengine/phonemodel/src -argv[160]: -i -argv[161]: Q:/epoc32/include -argv[162]: -i -argv[163]: Q:/epoc32/include/stdapis -argv[164]: -include -argv[165]: feature_settings.hrh -argv[166]: -o -argv[167]: Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb/unit_tests.o -argv[168]: Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/unit_tests.cpp - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwccsym2 @ctc-mwccsym2-26008.rsp -*** CTC++/ctcagent command status: 0 - -*** CTC++/ctcagent command status: 0 - -*** CTC++/ctcagent command status: 0 - -*** CTC++/ctcagent command status: 0 - - -******************************************************************************* - -argv[0]: C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\mwldsym2.exe -argv[1]: -msgstyle -argv[2]: gcc -argv[3]: -stdlib -argv[4]: -subsystem -argv[5]: windows -argv[6]: -g -argv[7]: -heapreserve=8192 -argv[8]: -heapcommit=128 -argv[9]: -m -argv[10]: ?_E32Bootstrap@@YGXXZ -argv[11]: Q:/epoc32/release/winscw/udeb/eexe.lib -argv[12]: Q:/epoc32/release/winscw/udeb/qtmain.lib -argv[13]: Q:/epoc32/release/winscw/udeb/QtSystemInfo.lib -argv[14]: Q:/epoc32/release/winscw/udeb/engineinfo.lib -argv[15]: Q:/epoc32/release/winscw/udeb/QtTest.lib -argv[16]: Q:/epoc32/release/winscw/udeb/HbCore.lib -argv[17]: Q:/epoc32/release/winscw/udeb/HbWidgets.lib -argv[18]: Q:/epoc32/release/winscw/udeb/HbUtils.lib -argv[19]: Q:/epoc32/release/winscw/udeb/libstdcppv5.lib -argv[20]: Q:/epoc32/release/winscw/udeb/QtSvg.lib -argv[21]: Q:/epoc32/release/winscw/udeb/QtGui.lib -argv[22]: Q:/epoc32/release/winscw/udeb/QtNetwork.lib -argv[23]: Q:/epoc32/release/winscw/udeb/QtCore.lib -argv[24]: Q:/epoc32/release/winscw/udeb/libpthread.lib -argv[25]: Q:/epoc32/release/winscw/udeb/libc.lib -argv[26]: Q:/epoc32/release/winscw/udeb/libm.lib -argv[27]: Q:/epoc32/release/winscw/udeb/euser.lib -argv[28]: Q:/epoc32/release/winscw/udeb/libdl.lib -argv[29]: -o -argv[30]: Q:/epoc32/release/winscw/udeb/ut_penetworkhandler.exe -argv[31]: -noimplib -argv[32]: -l -argv[33]: Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb -argv[34]: -search -argv[35]: @Q:/epoc32/build/ut_penetworkhandler/c_2302b1050784449d/ut_penetworkhandler_exe/winscw/udeb/ut_penetworkhandler_udeb_objects.lrf - -*** CTC++/ctcagent command: set PATH=c:\apps\sbs\win32\mingw\bin;c:\apps\sbs\win32\cygwin\bin;c:\apps\sbs\win32\bin;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_686\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\WiFi\bin;S:\ORANT\BIN;C:\Program Files\Rational\common;C:\APPS\pclint;C:\APPS\ctc;C:\APPS\cltools;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\unzip;C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Nokia\FastTrace;\epoc32\tools\qt;c:\apps\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\TortoiseGit\bin; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @C:\DOCUME~1\jukkrauh\LOCALS~1\Temp\ctc3\ctcopts.rsp mwldsym2 @ctc-mwldsym2-26056.rsp -*** CTC++/ctcagent command status: 0 - diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler.rss --- a/phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler.rss Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -// ============================================================================ -// * Generated by qmake (2.01a) (Qt 4.7.0) on: 2010-08-26T13:06:43 -// * This file is generated by qmake and should not be modified by the -// * user. -// ============================================================================ - -#include -#include - -RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info - { - short_caption = STRING_r_short_caption; - caption_and_icon = - CAPTION_AND_ICON_INFO - { - caption = STRING_r_caption; - number_of_icons = 0; - icon_file = ""; - }; - } - diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler_installer.pkg --- a/phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler_installer.pkg Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -; Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler//ut_penetworkhandler_installer.pkg generated by qmake at 2010-08-26T13:06:43 -; This file is generated by qmake and should not be modified by the user -; - -; Language -&EN - - -; SIS header: name, uid, version -#{"ut_penetworkhandler installer"},(0xA000D7CE),1,0,0 - -; Localised Vendor name -%{"Vendor"} - -; Unique Vendor name -:"Vendor" - - -; Manual PKG pre-rules from PRO files -; Default dependency to Qt libraries -; Default HW/platform dependencies -[0x101F7961],0,0,0,{"S60ProductID"} -[0x102032BE],0,0,0,{"S60ProductID"} -[0x102752AE],0,0,0,{"S60ProductID"} -[0x1028315F],0,0,0,{"S60ProductID"} -[0x20022e6d],0,0,0,{"S60ProductID"} - - - -"Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler.sis" - "c:\private\2002CCCE\import\ut_penetworkhandler.sis" -@"Q:/sf/mw/qt/smartinstaller.sis",(0x2002CCCD) diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler_reg.rss --- a/phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler_reg.rss Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -// ============================================================================ -// * Generated by qmake (2.01a) (Qt 4.7.0) on: 2010-08-26T13:06:43 -// * This file is generated by qmake and should not be modified by the -// * user. -// ============================================================================ - -#include -#include - -UID2 KUidAppRegistrationResourceFile -UID3 0xEA9BEFAA - -RESOURCE APP_REGISTRATION_INFO - { - app_file="ut_penetworkhandler"; - localisable_resource_file="\\resource\\apps\\ut_penetworkhandler"; - - } diff -r cfea66083b62 -r baacf668fe89 phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler_stub.pkg --- a/phoneengine/phonemodel/tsrc/ut_penetworkhandler/ut_penetworkhandler_stub.pkg Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -; Q:/sf/app/phone/phoneengine/phonemodel/tsrc/ut_penetworkhandler//ut_penetworkhandler_stub.pkg generated by qmake at 2010-08-26T13:06:43 -; This file is generated by qmake and should not be modified by the user -; - -; Language -&EN - - -; SIS header: name, uid, version -#{"ut_penetworkhandler"},(0xEA9BEFAA),1,0,0 - -; Localised Vendor name -%{"Vendor"} - -; Unique Vendor name -:"Vendor" - - -; Manual PKG pre-rules from PRO files -; Default dependency to Qt libraries -; Default HW/platform dependencies - - -"" - "z:\sys\bin\ut_penetworkhandler.exe" -"" - "z:\resource\apps\ut_penetworkhandler.rsc" -"" - "z:\private\10003a3f\import\apps\ut_penetworkhandler_reg.rsc" - diff -r cfea66083b62 -r baacf668fe89 phoneengine/phoneservices/phoneservices.pro --- a/phoneengine/phoneservices/phoneservices.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phoneservices/phoneservices.pro Fri Oct 15 12:58:46 2010 +0300 @@ -54,4 +54,7 @@ for(header, headers.sources):BLD_INF_RULES.prj_exports += "$$header $$headers.path/$$basename(header)" BLD_INF_RULES.prj_exports += \ - "./rom/phoneservices_stub.sis /epoc32/data/z/system/install/phoneservices_stub.sis" \ No newline at end of file + "./rom/phoneservices_stub.sis /epoc32/data/z/system/install/phoneservices_stub.sis" + +symbian:MMP_RULES += SMPSAFE + diff -r cfea66083b62 -r baacf668fe89 phoneengine/phoneservices/src/dialservice.cpp --- a/phoneengine/phoneservices/src/dialservice.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phoneservices/src/dialservice.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -207,9 +207,13 @@ PHONE_TRACE1("NetworkServices capability missing"); return false; } - if (!caps.contains(ECapabilityNetworkControl)) { - PHONE_TRACE1("NetworkControl capability missing"); - return false; + if (!caps.contains(ECapabilityTrustedUI)) { + PHONE_TRACE1("TrustedUI capability missing"); + //fallback to check for NetworkControl, backwards compatibility + if (!caps.contains(ECapabilityNetworkControl)) { + PHONE_TRACE1("NetworkControl capability missing"); + return false; + } } return true; } diff -r cfea66083b62 -r baacf668fe89 phoneengine/phoneservices/tsrc/shared/mock_hbdevicemessagebox.cpp --- a/phoneengine/phoneservices/tsrc/shared/mock_hbdevicemessagebox.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneengine/phoneservices/tsrc/shared/mock_hbdevicemessagebox.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -1,8 +1,7 @@ -/* -* 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" +* 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". * @@ -77,6 +76,19 @@ // ----------------------------------------------------------------------------- +// HbDeviceMessageBox::question +// ----------------------------------------------------------------------------- +// +bool HbDeviceMessageBox::question( + const QString & text, + HbMessageBox::StandardButtons buttons ) + { + SMC_MOCK_METHOD2( bool, const QString &, text, + int /*HbMessageBox::StandardButtons*/, buttons ) + } + + +// ----------------------------------------------------------------------------- // HbDeviceMessageBox::information // ----------------------------------------------------------------------------- // @@ -181,6 +193,27 @@ // ----------------------------------------------------------------------------- +// HbDeviceMessageBox::setStandardButtons +// ----------------------------------------------------------------------------- +// +void HbDeviceMessageBox::setStandardButtons( + HbMessageBox::StandardButtons buttons ) + { + SMC_MOCK_METHOD1( void, int /* HbMessageBox::StandardButtons*/, buttons ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceMessageBox::standardButtons +// ----------------------------------------------------------------------------- +// +HbMessageBox::StandardButtons HbDeviceMessageBox::standardButtons( ) const + { + SMC_MOCK_METHOD0( int /*HbMessageBox::StandardButtons*/ ) + } + + +// ----------------------------------------------------------------------------- // HbDeviceMessageBox::setText // ----------------------------------------------------------------------------- // diff -r cfea66083b62 -r baacf668fe89 phoneplugins/csplugin/src/csprovider.cpp --- a/phoneplugins/csplugin/src/csprovider.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneplugins/csplugin/src/csprovider.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -106,6 +106,7 @@ delete iCallAddedHandler; delete iCipheringStatusMonitor; delete iDTMFProvider; + delete iConferenceCall; CSPLOGSTRING(CSPOBJECT, "CSProvider::~CSProvider close lines"); iLineContainer.Close(); diff -r cfea66083b62 -r baacf668fe89 phoneplugins/phoneindicatorplugin/inc/phoneindicators.h --- a/phoneplugins/phoneindicatorplugin/inc/phoneindicators.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneplugins/phoneindicatorplugin/inc/phoneindicators.h Fri Oct 15 12:58:46 2010 +0300 @@ -51,15 +51,16 @@ const char *primaryText; const char *secondaryText; Interaction interaction; + HbIndicatorInterface::Category catecory; }; Q_DECLARE_METATYPE(PhoneIndicatorInfo) static const int PhoneIndicatorCount = 3; static const PhoneIndicatorInfo IndicatorInfos[PhoneIndicatorCount] = { - {"qtg_mono_info.svg", "Missed call", "Name/Number", OpenMissedCallView }, - {"qtg_mono_info.svg", "Active call", " ", OpenCallUi }, - {"qtg_mono_info.svg", "Active diverts", " ", OpenDiverSettingsView } + {"qtg_mono_missed_call_unseen", "Missed call", "Name/Number", OpenMissedCallView, HbIndicatorInterface::NotificationCategory }, + {"qtg_mono_call", "Active call", " ", OpenCallUi, HbIndicatorInterface::NotificationCategory }, + {"qtg_mono_call_diverted", "Active diverts", " ", OpenDiverSettingsView, HbIndicatorInterface::SettingCategory } }; #endif // PHONEINDICATORS_H diff -r cfea66083b62 -r baacf668fe89 phoneplugins/phoneindicatorplugin/src/phoneindicatorinterface.cpp --- a/phoneplugins/phoneindicatorplugin/src/phoneindicatorinterface.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneplugins/phoneindicatorplugin/src/phoneindicatorinterface.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -27,7 +27,7 @@ const QString &indicatorType, int typeIndex, Interaction interaction) : - HbIndicatorInterface( indicatorType, HbIndicatorInterface::NotificationCategory, + HbIndicatorInterface( indicatorType, IndicatorInfos[typeIndex].catecory, (interaction == InteractionNone) ? NoInteraction : InteractionActivated), m_typeIndex(typeIndex), m_interaction(interaction), diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro --- a/phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro Fri Oct 15 12:58:46 2010 +0300 @@ -46,3 +46,5 @@ } BLD_INF_RULES.prj_exports += "./rom/cpbarringplugin_stub.sis /epoc32/data/z/system/install/cpbarringplugin_stub.sis" + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/callsplugin/callsplugin.pro --- a/phonesettings/cpphonesettingsplugins/callsplugin/callsplugin.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/callsplugin/callsplugin.pro Fri Oct 15 12:58:46 2010 +0300 @@ -51,3 +51,4 @@ BLD_INF_RULES.prj_exports += "./rom/cpcallsplugin_stub.sis /epoc32/data/z/system/install/cpcallsplugin_stub.sis" +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp --- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -423,29 +423,45 @@ { DPRINT << ": IN"; - QVariant text = m_DataItemCallWaiting->contentWidgetData("text"); - QString callWaitingText = text.toString(); - - if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_check_status")) { - // Clicked first time, user want to check feature status - DPRINT << "checking status"; - m_callWaitingWrapper->getCallWaitingStatus(); - } else if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_on")) { - DPRINT << "activate"; - // User want to activate call waiting feature - m_callWaitingWrapper->setCallWaiting( - PSetCallWaitingWrapper::ActivateCallWaiting, - AllTeleAndBearer); - } else if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_off")) { - DPRINT << "deactivate"; - // User want to deactivate call waiting feature - m_callWaitingWrapper->setCallWaiting( - PSetCallWaitingWrapper::DeactivateCallWaiting, - AllTeleAndBearer); - } else { - DWARNING << ": Error, unhandled index!"; + QString callWaitingText = + m_DataItemCallWaiting->contentWidgetData("text").toString(); + + //Check if offline or no network coverage + if (m_cpSettingsWrapper->isPhoneOffline()){ + revertCallWaitingSelection(); + emit showGlobalNote( + m_activeNoteId, + emit hbTrId("txt_phone_info_offline_not_allowed"), + HbMessageBox::MessageTypeWarning); + } else if (!m_cpSettingsWrapper->isConnectedToNetwork()){ + revertCallWaitingSelection(); + emit showGlobalNote( + m_activeNoteId, + emit hbTrId("txt_phone_info_no_network_coverage"), + HbMessageBox::MessageTypeWarning); + } else{ + if (callWaitingText == + hbTrId("txt_phone_setlabel_call_waiting_val_check_status")) { + // Clicked first time, user want to check feature status + DPRINT << "checking status"; + m_callWaitingWrapper->getCallWaitingStatus(); + } else if (callWaitingText == + hbTrId("txt_phone_setlabel_call_waiting_val_on")) { + DPRINT << "activate"; + // User want to activate call waiting feature + m_callWaitingWrapper->setCallWaiting( + PSetCallWaitingWrapper::ActivateCallWaiting, + AllTeleAndBearer); + } else if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_off")) { + DPRINT << "deactivate"; + // User want to deactivate call waiting feature + m_callWaitingWrapper->setCallWaiting( + PSetCallWaitingWrapper::DeactivateCallWaiting, + AllTeleAndBearer); + } else { + DWARNING << ": Error, unhandled index!"; + } } - DPRINT << ": OUT"; } @@ -593,11 +609,33 @@ { DPRINT << ": IN"; DPRINT << "errorCode:" << errorCode; - + + revertCallWaitingSelection(); + emit cancelNote(m_activeNoteId); emit showGlobalErrorNote(m_activeNoteId, errorCode); DPRINT << ": OUT"; } +void CpCallsPluginGroup::revertCallWaitingSelection() +{ + DPRINT << ": IN"; + QString callWaitingText = m_DataItemCallWaiting->contentWidgetData("text").toString(); + if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_on")){ + DPRINT << "Call waiting on, revert to OFF:"; + m_DataItemCallWaiting->setContentWidgetData( + "text", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_off"))); + m_DataItemCallWaiting->setContentWidgetData( + "additionalText", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_on"))); + } + if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_off")) { + DPRINT << "Call waiting off, revert to ON:"; + m_DataItemCallWaiting->setContentWidgetData( + "text", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_on"))); + m_DataItemCallWaiting->setContentWidgetData( + "additionalText", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_off"))); + } + DPRINT << ": OUT"; +} // End of File. diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.h --- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.h Fri Oct 15 12:58:46 2010 +0300 @@ -59,6 +59,8 @@ void insertMappedListItems(); + void revertCallWaitingSelection(); + public slots: void showCallDurationStateChanged(); diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp --- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -126,20 +126,37 @@ QList basicServiceGroupIds; // check status case + bool bIsConnected = true; + EXPECT(SettingsWrapper, isConnectedToNetwork).returns(bIsConnected); EXPECT(PSetCallWaitingWrapper, getCallWaitingStatus); m_callspluginGroup->callWaitingCurrentIndexChanged(); // active case m_callspluginGroup->handleCallWaitingGetStatus( PSetCallWaitingWrapper::StatusActive, basicServiceGroupIds); + EXPECT(SettingsWrapper, isConnectedToNetwork).returns(bIsConnected); EXPECT(PSetCallWaitingWrapper, setCallWaiting); m_callspluginGroup->callWaitingCurrentIndexChanged(); // deactive case m_callspluginGroup->handleCallWaitingGetStatus( PSetCallWaitingWrapper::StatusDisabled, basicServiceGroupIds); + EXPECT(SettingsWrapper, isConnectedToNetwork).returns(bIsConnected); EXPECT(PSetCallWaitingWrapper, setCallWaiting); m_callspluginGroup->callWaitingCurrentIndexChanged(); + + // offline case + m_callspluginGroup->handleCallWaitingGetStatus( + PSetCallWaitingWrapper::StatusActive, basicServiceGroupIds); + EXPECT(SettingsWrapper, isPhoneOffline).returns(bIsConnected); + m_callspluginGroup->callWaitingCurrentIndexChanged(); + + // no network case + m_callspluginGroup->handleCallWaitingGetStatus( + PSetCallWaitingWrapper::StatusDisabled, basicServiceGroupIds); + bIsConnected = false; + EXPECT(SettingsWrapper, isConnectedToNetwork).returns(bIsConnected); + m_callspluginGroup->callWaitingCurrentIndexChanged(); QVERIFY(verify()); } diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cpnetworkplugin/cpnetworkplugin.pro --- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/cpnetworkplugin.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/cpnetworkplugin.pro Fri Oct 15 12:58:46 2010 +0300 @@ -43,3 +43,5 @@ } BLD_INF_RULES.prj_exports += "./rom/cpnetworkplugin_stub.sis /epoc32/data/z/system/install/cpnetworkplugin_stub.sis" + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp --- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -15,6 +15,7 @@ * */ #include + #include "cpnetworkplugin.h" #include "cpnetworkpluginview.h" #include "cppluginlogging.h" @@ -25,21 +26,16 @@ */ CpNetworkPlugin::CpNetworkPlugin() : QObject(NULL), - m_localisation(NULL), + m_translator(NULL), m_networkStatus(NULL) { INSTALL_TRACE_MSG_HANDLER; DPRINT << ": IN"; - // Create guarded objects - m_localisation.reset(new PhoneLocalisation); + m_translator.reset(new HbTranslator(QString("telephone_cp"))); + m_translator->loadCommon(); m_networkStatus.reset(new CpNetworkStatus); - // Install required translations - m_localisation->installTranslator( - PhoneLocalisation:: - TranslationFileCommon); - DPRINT << ": OUT"; } diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h --- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h Fri Oct 15 12:58:46 2010 +0300 @@ -19,11 +19,11 @@ #define CPNETWORKPLUGIN_H #include + #include #include +#include #include "cpnetworkstatus.h" -#include "cpphonelocalisation.h" - class CpNetworkPlugin : public QObject, @@ -53,7 +53,7 @@ CpBaseSettingView *createSettingView(const QVariant &hint) const; private: - QScopedPointer m_localisation; + QScopedPointer m_translator; QScopedPointer m_networkStatus; }; diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat --- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat Fri Oct 15 12:58:46 2010 +0300 @@ -138,6 +138,7 @@ call cd %1 call qmake call sbs --config winscw_udeb --keepgoing CLEAN +call sbs RESOURCE if [%INSTRUMENT%] EQU [TRUE] ( call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%" ) else ( diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro --- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro Fri Oct 15 12:58:46 2010 +0300 @@ -45,19 +45,18 @@ # code to be tested HEADERS += ../../src/cpnetworkplugin.h \ ../../src/cpnetworkpluginview.h \ - ../../src/cpnetworkstatus.h \ - ../../../cptelephonyutils/inc/cpphonelocalisation.h + ../../src/cpnetworkstatus.h SOURCES += ../../src/cpnetworkplugin.cpp # mocks needed for testing SOURCES += ../../../tsrc/mocks/mock_cpnetworkpluginview.cpp -SOURCES += ../../../tsrc/mocks/mock_cpphonelocalisation.cpp SOURCES += ../../../tsrc/mocks/mock_hbicon.cpp SOURCES += ../../../tsrc/mocks/mock_cpsettingformentryitemdata.cpp SOURCES += ../../../tsrc/mocks/mock_cpbasesettingview.cpp SOURCES += ../../../tsrc/mocks/mock_hbview.cpp SOURCES += ../../../tsrc/mocks/mock_cpnetworkstatus.cpp +SOURCES += ../../../tsrc/mocks/mock_hbtranslator.cpp diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro --- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro Fri Oct 15 12:58:46 2010 +0300 @@ -48,7 +48,6 @@ ../../src/cpnetworkpluginform.h \ ../../src/cellulardatasettings.h \ ../../../cptelephonyutils/inc/cpplugincommon.h \ - ../../../cptelephonyutils/inc/cpphonelocalisation.h \ /epoc32/include/platform/mw/psetwrapper.h \ /epoc32/include/platform/mw/psuinotes.h \ /epoc32/include/platform/mw/psetcliwrapper.h \ @@ -65,7 +64,6 @@ ../../../tsrc/mocks/mock_psetnetworkwrapper.cpp \ ../../../tsrc/mocks/mock_cpplugincommon.cpp \ ../../../tsrc/mocks/mock_psuinotes.cpp \ - ../../../tsrc/mocks/mock_cpphonelocalisation.cpp \ ../../../tsrc/mocks/mock_hbdialog.cpp \ ../../../tsrc/mocks/mock_hbwidget.cpp \ ../../../tsrc/mocks/mock_cellulardatasettings.cpp diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cpphonesettingsplugins.pro --- a/phonesettings/cpphonesettingsplugins/cpphonesettingsplugins.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpphonesettingsplugins.pro Fri Oct 15 12:58:46 2010 +0300 @@ -24,5 +24,3 @@ "./rom/cpphonesettingsplugins.iby CORE_APP_LAYER_IBY_EXPORT_PATH(cpphonesettingsplugins.iby)" \ "./rom/cpphonesettingsplugins_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(cpphonesettingsplugins_resources.iby)" } -HEADERS = cptelephonyutils/inc/cpphonelocalisation.h -SOURCES = cptelephonyutils/src/cpphonelocalisation.cpp diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/bwins/cptelephonyutilsu.def --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/bwins/cptelephonyutilsu.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/bwins/cptelephonyutilsu.def Fri Oct 15 12:58:46 2010 +0300 @@ -1,54 +1,41 @@ EXPORTS ?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 *) + ?qt_metacall@SettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3 NONAME ; int SettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?readSoftRejectText@SettingsWrapper@@QAEXAAVQString@@AA_N@Z @ 4 NONAME ; void SettingsWrapper::readSoftRejectText(class QString &, bool &) + ?getStaticMetaObject@Tools@@SAABUQMetaObject@@XZ @ 5 NONAME ; struct QMetaObject const & Tools::getStaticMetaObject(void) + ?isPhoneOffline@SettingsWrapper@@QBE_NXZ @ 6 NONAME ; bool SettingsWrapper::isPhoneOffline(void) const + ?qt_metacast@SettingsWrapper@@UAEPAXPBD@Z @ 7 NONAME ; void * SettingsWrapper::qt_metacast(char const *) + ?trUtf8@SettingsWrapper@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString SettingsWrapper::trUtf8(char const *, char const *) + ?tr@SettingsWrapper@@SA?AVQString@@PBD0@Z @ 9 NONAME ; class QString SettingsWrapper::tr(char const *, char const *) + ?forbiddenIconSupported@SettingsWrapper@@QBE_NXZ @ 10 NONAME ; bool SettingsWrapper::forbiddenIconSupported(void) const + ?metaObject@Tools@@UBEPBUQMetaObject@@XZ @ 11 NONAME ; struct QMetaObject const * Tools::metaObject(void) const + ?writeSoftRejectText@SettingsWrapper@@QAEHABVQString@@_N@Z @ 12 NONAME ; int SettingsWrapper::writeSoftRejectText(class QString const &, bool) + ?readCenrepString@SettingsWrapper@@ABE?AVQString@@JK@Z @ 13 NONAME ; class QString SettingsWrapper::readCenrepString(long, unsigned long) const + ?videoSupported@Tools@@SA_NXZ @ 14 NONAME ; bool Tools::videoSupported(void) + ?tr@SettingsWrapper@@SA?AVQString@@PBD0H@Z @ 15 NONAME ; class QString SettingsWrapper::tr(char const *, char const *, int) + ?isFeatureCallWaitingDistiquishNotProvisionedEnabled@SettingsWrapper@@QAE_NXZ @ 16 NONAME ; bool SettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void) + ?isOngoingCall@SettingsWrapper@@QBE_NXZ @ 17 NONAME ; bool SettingsWrapper::isOngoingCall(void) const + ?qt_metacall@Tools@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 18 NONAME ; int Tools::qt_metacall(enum QMetaObject::Call, int, void * *) + ?writeCenrepValue@SettingsWrapper@@ABEHJKABVQVariant@@@Z @ 19 NONAME ; int SettingsWrapper::writeCenrepValue(long, unsigned long, class QVariant const &) const + ?readVtVideoSending@SettingsWrapper@@QAEHXZ @ 20 NONAME ; int SettingsWrapper::readVtVideoSending(void) + ?staticMetaObject@SettingsWrapper@@2UQMetaObject@@B @ 21 NONAME ; struct QMetaObject const SettingsWrapper::staticMetaObject + ?readPubSubValue@SettingsWrapper@@ABE?AVQVariant@@JK@Z @ 22 NONAME ; class QVariant SettingsWrapper::readPubSubValue(long, unsigned long) const + ?readCenrepValue@SettingsWrapper@@ABE?AVQVariant@@JK@Z @ 23 NONAME ; class QVariant SettingsWrapper::readCenrepValue(long, unsigned long) const + ?tr@Tools@@SA?AVQString@@PBD0@Z @ 24 NONAME ; class QString Tools::tr(char const *, char const *) + ?isConnectedToNetwork@SettingsWrapper@@QBE_NXZ @ 25 NONAME ; bool SettingsWrapper::isConnectedToNetwork(void) const + ?voipSupported@Tools@@SA_NXZ @ 26 NONAME ; bool Tools::voipSupported(void) + ?qt_metacast@Tools@@UAEPAXPBD@Z @ 27 NONAME ; void * Tools::qt_metacast(char const *) + ?trUtf8@Tools@@SA?AVQString@@PBD0H@Z @ 28 NONAME ; class QString Tools::trUtf8(char const *, char const *, int) + ??0SettingsWrapper@@QAE@PAVQObject@@@Z @ 29 NONAME ; SettingsWrapper::SettingsWrapper(class QObject *) + ?setShowCallDuration@SettingsWrapper@@QAEH_N@Z @ 30 NONAME ; int SettingsWrapper::setShowCallDuration(bool) + ?tr@Tools@@SA?AVQString@@PBD0H@Z @ 31 NONAME ; class QString Tools::tr(char const *, char const *, int) + ?metaObject@SettingsWrapper@@UBEPBUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const * SettingsWrapper::metaObject(void) const + ?getStaticMetaObject@SettingsWrapper@@SAABUQMetaObject@@XZ @ 33 NONAME ; struct QMetaObject const & SettingsWrapper::getStaticMetaObject(void) + ?showCallDuration@SettingsWrapper@@QAE_NXZ @ 34 NONAME ; bool SettingsWrapper::showCallDuration(void) + ?writeVtVideoSending@SettingsWrapper@@QAEHH@Z @ 35 NONAME ; int SettingsWrapper::writeVtVideoSending(int) + ??1SettingsWrapper@@UAE@XZ @ 36 NONAME ; SettingsWrapper::~SettingsWrapper(void) + ??_ESettingsWrapper@@UAE@I@Z @ 37 NONAME ; SettingsWrapper::~SettingsWrapper(unsigned int) + ?staticMetaObject@Tools@@2UQMetaObject@@B @ 38 NONAME ; struct QMetaObject const Tools::staticMetaObject + ?trUtf8@Tools@@SA?AVQString@@PBD0@Z @ 39 NONAME ; class QString Tools::trUtf8(char const *, char const *) diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro Fri Oct 15 12:58:46 2010 +0300 @@ -24,11 +24,8 @@ SOURCEPATH += src # Input -HEADERS += inc/cpplugincommon.h \ - inc/cpphonelocalisation.h - -SOURCES += src/cpphonelocalisation.cpp - +HEADERS += inc/cpplugincommon.h + symbian: { SOURCES += src/cpplugincommon.cpp } @@ -75,3 +72,5 @@ } BLD_INF_RULES.prj_exports += "./rom/cptelephonyutils_stub.sis /epoc32/data/z/system/install/cptelephonyutils_stub.sis" + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/eabi/cptelephonyutilsu.def --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/eabi/cptelephonyutilsu.def Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/eabi/cptelephonyutilsu.def Fri Oct 15 12:58:46 2010 +0300 @@ -15,38 +15,25 @@ _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 - _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 - _ZTI15SettingsWrapper @ 45 NONAME - _ZTI17PhoneLocalisation @ 46 NONAME - _ZTI5Tools @ 47 NONAME - _ZTV15SettingsWrapper @ 48 NONAME - _ZTV17PhoneLocalisation @ 49 NONAME - _ZTV5Tools @ 50 NONAME + _ZN5Tools11qt_metacallEN11QMetaObject4CallEiPPv @ 17 NONAME + _ZN5Tools11qt_metacastEPKc @ 18 NONAME + _ZN5Tools13voipSupportedEv @ 19 NONAME + _ZN5Tools14videoSupportedEv @ 20 NONAME + _ZN5Tools16staticMetaObjectE @ 21 NONAME DATA 16 + _ZN5Tools19getStaticMetaObjectEv @ 22 NONAME + _ZNK15SettingsWrapper10metaObjectEv @ 23 NONAME + _ZNK15SettingsWrapper13isOngoingCallEv @ 24 NONAME + _ZNK15SettingsWrapper14isPhoneOfflineEv @ 25 NONAME + _ZNK15SettingsWrapper15readCenrepValueElm @ 26 NONAME + _ZNK15SettingsWrapper15readPubSubValueElm @ 27 NONAME + _ZNK15SettingsWrapper16readCenrepStringElm @ 28 NONAME + _ZNK15SettingsWrapper16writeCenrepValueElmRK8QVariant @ 29 NONAME + _ZNK15SettingsWrapper20isConnectedToNetworkEv @ 30 NONAME + _ZNK15SettingsWrapper22forbiddenIconSupportedEv @ 31 NONAME + _ZNK15SettingsWrapper23numberGroupingSupportedEv @ 32 NONAME + _ZNK5Tools10metaObjectEv @ 33 NONAME + _ZTI15SettingsWrapper @ 34 NONAME + _ZTI5Tools @ 35 NONAME + _ZTV15SettingsWrapper @ 36 NONAME + _ZTV5Tools @ 37 NONAME diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpphonelocalisation.h --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpphonelocalisation.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +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 CPPHONELOCALISATION_H_ -#define CPPHONELOCALISATION_H_ - -#include -#include -#include "cptelephonyutilsdefs.h" - -// Forward declarations -class QTranslator; - -class TELEPHONYUTILS_EXPORT PhoneLocalisation : public QObject - { - Q_OBJECT - -public: - - enum TranslationFileId { - TranslationFileCommon, - TranslationFileTelephoneCp - }; - -public: - - PhoneLocalisation(QObject *parent = NULL); - ~PhoneLocalisation(); - - bool installTranslator(TranslationFileId translationFileId); - void removeTranslators(); - -private: - - QList m_translators; - - }; - - -#endif /* CPPHONELOCALISATION_H_ */ diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h Fri Oct 15 12:58:46 2010 +0300 @@ -58,6 +58,7 @@ public: SettingsWrapper(QObject *parent = NULL); ~SettingsWrapper(); + public: /*! Show call duration setting @@ -101,6 +102,13 @@ */ bool isOngoingCall() const; + /*! + Checks if network is connected. + Return true if connected. + Return false if not connected. + */ + bool isConnectedToNetwork() const; + /*! Forbidden Icon support */ @@ -132,7 +140,7 @@ // Own XQSettingsManager *m_settings; - QSystemDeviceInfo *m_deviceInfo; + }; #endif // CPPLUGINCOMMON_H diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpphonelocalisation.cpp --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpphonelocalisation.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * This component and the accompanying materials are made available - * under the terms of "Eclipse Public License v1.0" - * which accompanies this distribution, and is available - * at the URL "http://www.eclipse.org/legal/epl-v10.html". - * - * Initial Contributors: - * Nokia Corporation - initial contribution. - * - * Contributors: - * - * Description: - * - */ -#include "cpphonelocalisation.h" -#include "cppluginlogging.h" -#include -#include -#include - - -// Constant definitions -const char *TS_FILE_TELEPHONE_CP = "telephone_cp"; -const char *TS_FILE_COMMON = "common"; - -/*! - \class PhoneLocalisation - \brief Localisation utility class for - Telephony control panel plugins. - - Use installTranslator function for installing - needed translation files. - - Takes ownership of the created QTranslator objects - and destroys them when PhoneLocalisation - object is destructed. -*/ - - -/*! - PhoneLocalisation::PhoneLocalisation() -*/ -PhoneLocalisation::PhoneLocalisation(QObject *parent) - :QObject(parent) -{ - DPRINT; -} - - -/*! - PhoneLocalisation::~PhoneLocalisation() -*/ -PhoneLocalisation::~PhoneLocalisation() -{ - DPRINT << ":IN"; - removeTranslators(); - DPRINT << ":OUT"; -} - - -/*! - PhoneLocalisation::installTranslator() -*/ -bool PhoneLocalisation::installTranslator( - TranslationFileId translationFileId) -{ - DPRINT << ": IN"; - - QString lang = QLocale::system().name(); - QString path = "z:/resource/qt/translations/"; - bool translatorLoaded(false); - - QString fileName; - switch (translationFileId) { - case TranslationFileTelephoneCp: - fileName = TS_FILE_TELEPHONE_CP; - break; - case TranslationFileCommon: - fileName = TS_FILE_COMMON; - break; - default: - DWARNING << ": Unknown enum value!"; - break; - } - - if (!fileName.isEmpty()) { - QTranslator* translator = new QTranslator; - translatorLoaded = translator->load( - path + fileName + "_" + lang); - if (translatorLoaded) { - m_translators.append(translator); - qApp->installTranslator(translator); - DPRINT << ": translator installed: " << fileName; - } else { - delete translator; - translator = NULL; - DWARNING << ": Translator not loaded!"; - } - } - - DPRINT << ": OUT"; - return translatorLoaded; -} - - -/*! - PhoneLocalisation::removeTranslators() -*/ -void PhoneLocalisation::removeTranslators() -{ - DPRINT << ": IN"; - - foreach (QTranslator *translator, m_translators) { - qApp->removeTranslator(translator); - } - qDeleteAll(m_translators); - m_translators.clear(); - - DPRINT << ": OUT"; -} - - -// End of File. diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -61,11 +61,10 @@ SettingsWrapper::SettingsWrapper(QObject *parent): QObject(parent), - m_settings(NULL), - m_deviceInfo(NULL) + m_settings(NULL) { m_settings = new XQSettingsManager(this); - m_deviceInfo = new QSystemDeviceInfo(this); + } SettingsWrapper::~SettingsWrapper() @@ -211,3 +210,27 @@ } return callOngoing; } + +bool SettingsWrapper::isConnectedToNetwork() const +{ + DPRINT << ": IN"; + + const QScopedPointer networkInfo(new QSystemNetworkInfo); + bool connected(false); + + QSystemNetworkInfo::NetworkStatus wcdmaStatus = + networkInfo->networkStatus(QSystemNetworkInfo::WcdmaMode); + QSystemNetworkInfo::NetworkStatus gsmStatus = + networkInfo->networkStatus(QSystemNetworkInfo::GsmMode); + + if (QSystemNetworkInfo::Connected == wcdmaStatus || + QSystemNetworkInfo::HomeNetwork == wcdmaStatus || + QSystemNetworkInfo::Roaming == wcdmaStatus || + QSystemNetworkInfo::Connected == gsmStatus || + QSystemNetworkInfo::HomeNetwork == gsmStatus || + QSystemNetworkInfo::Roaming == gsmStatus) { + connected = true; + } + DPRINT << ": OUT " << connected; + return connected; +} diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.cpp --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include "ut_cpphonelocalisation.h" -#include "qtestmains60.h" -#include -#define private public -#include "cpphonelocalisation.h" - -void QCoreApplication::installTranslator(QTranslator * messageFile) -{ - SMC_MOCK_METHOD1( void, QTranslator *, messageFile) -} - -/*! - UT_cpphonelocalisation::UT_cpphonelocalisation - */ -UT_cpphonelocalisation::UT_cpphonelocalisation() -{ - -} - -/*! - UT_cpphonelocalisation::~UT_cpphonelocalisation - */ -UT_cpphonelocalisation::~UT_cpphonelocalisation() -{ - -} - -/*! - UT_cpphonelocalisation::init - */ -void UT_cpphonelocalisation::init() -{ - initialize(); - - m_phoneLocalisation.reset(new PhoneLocalisation); -} - -/*! - UT_cpphonelocalisation::cleanup - */ -void UT_cpphonelocalisation::cleanup() -{ - reset(); - delete m_phoneLocalisation.take(); -} - -/*! - UT_cpphonelocalisation::t_memleak - */ -void UT_cpphonelocalisation::t_memleak() -{ - -} - -/*! - UT_cpphonelocalisation::t_installTranslator - */ -void UT_cpphonelocalisation::t_installTranslator() -{ - - // Test: successfull load - expect("QTranslator::load"). - returns(true); - expect("QCoreApplication::installTranslator").times(1); - - m_phoneLocalisation->installTranslator( - PhoneLocalisation::TranslationFileCommon); - QVERIFY(m_phoneLocalisation->m_translators.count() == 1); - QVERIFY(verify()); - - // Test: failing load - expect("QTranslator::load"). - returns(false); - expect("QCoreApplication::installTranslator").times(0); - m_phoneLocalisation->installTranslator( - PhoneLocalisation::TranslationFileCommon); - QVERIFY(m_phoneLocalisation->m_translators.count() == 1); - - // Test: Unknown enum value - QVERIFY(verify()); - expect("QCoreApplication::installTranslator").times(0); - m_phoneLocalisation->installTranslator( - (PhoneLocalisation::TranslationFileId)2); - QVERIFY(m_phoneLocalisation->m_translators.count() == 1); - QVERIFY(verify()); - - // Test: telephone_cp translator load - expect("QTranslator::load"). - returns(false); - expect("QCoreApplication::installTranslator").times(0); - m_phoneLocalisation->installTranslator( - PhoneLocalisation::TranslationFileTelephoneCp); - QVERIFY(verify()); - -} - -/*! - UT_cpphonelocalisation::t_removeTranslators - */ -void UT_cpphonelocalisation::t_removeTranslators() -{ - expect("QTranslator::load"). - returns(true); - - m_phoneLocalisation->installTranslator( - PhoneLocalisation::TranslationFileCommon); - m_phoneLocalisation->installTranslator( - PhoneLocalisation::TranslationFileTelephoneCp); - - m_phoneLocalisation->removeTranslators(); - QVERIFY(m_phoneLocalisation->m_translators.count() == 0); - QVERIFY(verify()); -} - - - - -QTEST_MAIN_S60(UT_cpphonelocalisation) diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.h --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.h Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef UT_CPPHONELOCALISATION_H -#define UT_CPPHONELOCALISATION_H - -#include -#include - -class PhoneLocalisation; - -class UT_cpphonelocalisation : public QObject, MockService -{ - Q_OBJECT - -public: - UT_cpphonelocalisation(); - ~UT_cpphonelocalisation(); - -private slots: - void init(); - void cleanup(); - void t_memleak(); - void t_installTranslator(); - void t_removeTranslators(); - -private: - QScopedPointer m_phoneLocalisation; - -}; - -#endif diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.pro --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.pro Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -CONFIG += qtestlib -CONFIG += hb -TEMPLATE = app -TARGET = -DEPENDPATH += . ../../src/ -INCLUDEPATH += . ../../inc/ -INCLUDEPATH += ../../../tsrc/common -DEFINES += BUILD_TELEPHONYUTILS - -QT -= gui -QT += testlib - -symbian: { - CONFIG += no_icon - INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - LIBS += -lmocklib -lsymbianmock -} - -# test code -HEADERS += ut_cpphonelocalisation.h -SOURCES += ut_cpphonelocalisation.cpp - -# code to be tested -HEADERS += ../../inc/cpphonelocalisation.h - -SOURCES += ../../src/cpphonelocalisation.cpp - -# mocks needed for testing -SOURCES += ../../../tsrc/mocks/mock_qtranslator.cpp - - -symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp Fri Oct 15 12:58:46 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" @@ -75,9 +75,13 @@ */ void UT_CpPluginCommon::t_showCallDuration() { - EXPECT(XQSettingsManager, readItemValue). - returns(QVariant(23324)); + // Case CenrepKeyValueOff + EXPECT(XQSettingsManager, readItemValue).returns(QVariant(0)); + mWrapper->showCallDuration(); + QVERIFY(verify()); + // Case CenrepKeyValueOn + EXPECT(XQSettingsManager, readItemValue).returns(QVariant(1)); mWrapper->showCallDuration(); QVERIFY(verify()); } @@ -224,10 +228,54 @@ */ void UT_CpPluginCommon::t_isOngoingCall() { + // Case EPSCTsyCallStateNone EXPECT(XQSettingsManager, readItemValue). returns(QVariant(1)); mWrapper->isOngoingCall(); QVERIFY( verify() ); + + // Case EPSCTsyCallStateConnected + EXPECT(XQSettingsManager, readItemValue). + returns(QVariant(7)); + mWrapper->isOngoingCall(); + QVERIFY( verify() ); +} + +/*! + UT_CpPluginCommon::t_forbiddenIconSupported + */ +void UT_CpPluginCommon::t_forbiddenIconSupported() +{ + EXPECT(XQSettingsManager, readItemValue). + returns(QVariant(true)); + mWrapper->forbiddenIconSupported(); + QVERIFY( verify() ); +} + +/*! + UT_CpPluginCommon::t_isConnectedToNetwork + */ +void UT_CpPluginCommon::t_isConnectedToNetwork() +{ + // Not connected to network + QT_TRAP_THROWING(SmcDefaultValue< QSystemNetworkInfo::NetworkStatus >:: + SetL(QSystemNetworkInfo::NoNetworkAvailable)); + EXPECT(QtMobility::QSystemNetworkInfo, networkStatus). + with(QSystemNetworkInfo::WcdmaMode); + EXPECT(QtMobility::QSystemNetworkInfo, networkStatus). + with(QSystemNetworkInfo::GsmMode); + mWrapper->isConnectedToNetwork(); + QVERIFY( verify() ); + + // Connected to network + QT_TRAP_THROWING(SmcDefaultValue< QSystemNetworkInfo::NetworkStatus >:: + SetL(QSystemNetworkInfo::Connected)); + EXPECT(QtMobility::QSystemNetworkInfo, networkStatus). + with(QSystemNetworkInfo::WcdmaMode); + EXPECT(QtMobility::QSystemNetworkInfo, networkStatus). + with(QSystemNetworkInfo::GsmMode); + mWrapper->isConnectedToNetwork(); + QVERIFY( verify() ); } QTEST_MAIN_S60(UT_CpPluginCommon) diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h Fri Oct 15 12:58:46 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" @@ -53,6 +53,8 @@ void t_isFeatureCallWaitingDistiquishNotProvisionedEnabled(); void t_isPhoneOffline(); void t_isOngoingCall(); + void t_forbiddenIconSupported(); + void t_isConnectedToNetwork(); private: SettingsWrapper *mWrapper; diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro Fri Oct 15 12:58:46 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" @@ -10,8 +10,8 @@ # Nokia Corporation - initial contribution. # # Contributors: -# -# Description: +# +# Description: Project file for building unit test component # CONFIG += qtestlib hb mobility diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/divertplugin/divertplugin.pro --- a/phonesettings/cpphonesettingsplugins/divertplugin/divertplugin.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/divertplugin/divertplugin.pro Fri Oct 15 12:58:46 2010 +0300 @@ -53,3 +53,5 @@ } BLD_INF_RULES.prj_exports += "./rom/cpdivertplugin_stub.sis /epoc32/data/z/system/install/cpdivertplugin_stub.sis" + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -16,6 +16,7 @@ */ #include #include + #include "cptelephonyplugin.h" #include "cptelephonypluginview.h" #include "cppluginlogging.h" @@ -26,23 +27,13 @@ */ CpTelephonyPlugin::CpTelephonyPlugin() : QObject(0), - m_localisation(0) + m_translator(NULL) { // Install plugin specific msg handler INSTALL_TRACE_MSG_HANDLER; DPRINT << ": IN"; - - // Set scoped pointer - m_localisation.reset(new PhoneLocalisation(this)); - - // Install required translations - m_localisation->installTranslator( - PhoneLocalisation:: - TranslationFileCommon); - m_localisation->installTranslator( - PhoneLocalisation:: - TranslationFileTelephoneCp); - + m_translator.reset(new HbTranslator(QString("telephone_cp"))); + m_translator->loadCommon(); DPRINT << ": OUT"; } diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h Fri Oct 15 12:58:46 2010 +0300 @@ -20,9 +20,10 @@ #include #include +#include #include #include -#include "cpphonelocalisation.h" + /*! \class CpTelephonyPlugin @@ -53,10 +54,11 @@ @see CpLauncherInterface. */ virtual CpBaseSettingView *createSettingView(const QVariant &hint) const; - + + private: - - QScopedPointer m_localisation; + + QScopedPointer m_translator; }; #endif /* CPTELEPHONYPLUGIN_H */ diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -109,7 +109,7 @@ CpSettingFormItemData* expandedItem(NULL); foreach (QVariant var, params){ items.append(groupItemFromPlugin(var.toString())); - if(!expanded){ + if (!expanded && !items.isEmpty()) { expandedItem = items.last(); expanded = true; } diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/telephonyplugin.pro --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/telephonyplugin.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/telephonyplugin.pro Fri Oct 15 12:58:46 2010 +0300 @@ -48,3 +48,5 @@ } BLD_INF_RULES.prj_exports += "./rom/cptelephonyplugin_stub.sis /epoc32/data/z/system/install/cptelephonyplugin_stub.sis" + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat Fri Oct 15 12:58:46 2010 +0300 @@ -138,6 +138,7 @@ call cd %1 call qmake call sbs --config winscw_udeb --keepgoing CLEAN +call sbs RESOURCE if [%INSTRUMENT%] EQU [TRUE] ( call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%" ) else ( diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.pro --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.pro Fri Oct 15 12:58:46 2010 +0300 @@ -48,6 +48,6 @@ # mocks needed for testing SOURCES += ../../../tsrc/mocks/mock_cptelephonypluginview.cpp - +SOURCES += ../../../tsrc/mocks/mock_hbtranslator.cpp symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -24,6 +24,7 @@ #include #include #include "cptelephonypluginview.h" +#include class DummyPlugin : public CpPluginInterface @@ -43,9 +44,7 @@ UT_CpTelephonyPluginView::UT_CpTelephonyPluginView */ UT_CpTelephonyPluginView::UT_CpTelephonyPluginView() - : m_callspluginview(NULL) { - } /*! @@ -53,33 +52,17 @@ */ UT_CpTelephonyPluginView::~UT_CpTelephonyPluginView() { - delete m_callspluginview; } - /*! UT_CpTelephonyPluginView::init */ void UT_CpTelephonyPluginView::init() { initialize(); - - CpPluginInterface *nullPlugin=0; - DummyPlugin *ret = new DummyPlugin; +} - QList list; - list.append(new CpSettingFormItemData); - expect("CpPluginLoader::loadCpPluginInterface"). - with(QString("cpcallsplugin")).returns(ret); - expect("DummyPlugin::createSettingFormItemData").returns(list); - expect("CpPluginLoader::loadCpPluginInterface"). - with(QString("cpdivertplugin")).returns(nullPlugin); - - m_callspluginview = new CpTelephonyPluginView; - QVERIFY( verify() ); - -} /*! UT_CpTelephonyPluginView::cleanup @@ -87,11 +70,9 @@ void UT_CpTelephonyPluginView::cleanup() { reset(); - - delete m_callspluginview; - m_callspluginview = NULL; } + /*! UT_CpTelephonyPluginView::t_memleak */ @@ -100,21 +81,66 @@ QList list; list.append(new CpSettingFormItemData); DummyPlugin *ret = new DummyPlugin; - expect("CpPluginLoader::loadCpPluginInterface"). - with(QString("cpcallsplugin")).returns(ret); - expect("DummyPlugin::createSettingFormItemData").returns(list); - - ret = new DummyPlugin; - expect("CpPluginLoader::loadCpPluginInterface"). - with(QString("cpdivertplugin")).returns(ret); - expect("DummyPlugin::createSettingFormItemData").returns(list); - - + + HbDataForm *form = new HbDataForm; + EXPECT(HbView, widget).returns(form); + + EXPECT(CpPluginLoader, loadCpPluginInterface). + with(QString("cpcallsplugin")).returns(ret); // Ownership change. + EXPECT(DummyPlugin, createSettingFormItemData).returns(list); + + // For clarity, create a new pointer instead of using the existing one. + DummyPlugin *dummy = new DummyPlugin; + EXPECT(CpPluginLoader, loadCpPluginInterface). + with(QString("cpdivertplugin")).returns(dummy); // Ownership change. + EXPECT(DummyPlugin, createSettingFormItemData).returns(list); + + QModelIndex index; + EXPECT(HbDataFormModel, indexFromItem).returns(index); + CpTelephonyPluginView *tmp = new CpTelephonyPluginView; - QVERIFY( verify() ); + QVERIFY(verify()); delete tmp; + delete form; + + // Test constructor that doesn't call any other functions. + EXPECT(HbView, widget).returns(0); + CpTelephonyPluginView *tmp2 = new CpTelephonyPluginView; + QVERIFY(verify()); + delete tmp2; } +void UT_CpTelephonyPluginView::t_construct2() +{ + QVariantList list; + list.append("blah"); + list.append("blaah"); + + // Test constructor that doesn't call any other functions. + EXPECT(HbView, widget).returns(0); + CpTelephonyPluginView *tmp = new CpTelephonyPluginView(list); + QVERIFY(verify()); + delete tmp; + + // Do the "real" test. + QModelIndex index; + HbDataForm *form = new HbDataForm; + EXPECT(HbView, widget).returns(form); + + DummyPlugin *dummy = new DummyPlugin; + EXPECT(CpPluginLoader, loadCpPluginInterface). + with(QString("blaah")).returns(dummy); // Ownership change. + QList list2; + list2.append(new CpSettingFormItemData); + EXPECT(DummyPlugin, createSettingFormItemData).returns(list2); + + EXPECT(HbDataFormModel, indexFromItem).returns(index); + CpTelephonyPluginView *tmp2 = new CpTelephonyPluginView(list); + QVERIFY(verify()); + delete form; + delete tmp2; +} + QTEST_MAIN_S60UI(UT_CpTelephonyPluginView) diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.h --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.h Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.h Fri Oct 15 12:58:46 2010 +0300 @@ -34,13 +34,10 @@ private slots: void init(); - void cleanup(); void t_memleak(); - -private: - CpTelephonyPluginView *m_callspluginview; + void t_construct2(); }; diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro Fri Oct 15 12:58:46 2010 +0300 @@ -53,5 +53,9 @@ SOURCES += ../../../tsrc/mocks/mock_cpbasesettingview.cpp SOURCES += ../../../tsrc/mocks/mock_cpitemdatahelper.cpp SOURCES += ../../../tsrc/mocks/mock_cpsettingformitemdata.cpp +SOURCES += ../../../tsrc/mocks/mock_hbview.cpp +SOURCES += ../../../tsrc/mocks/mock_hbdataformmodel.cpp +SOURCES += ../../../tsrc/mocks/mock_hbdataform.cpp +SOURCES += ../../../tsrc/mocks/mock_hbabstractitemview.cpp symbian:MMP_RULES += SMPSAFE \ No newline at end of file diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpphonelocalisation.cpp --- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpphonelocalisation.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#include -#include -#include "cpphonelocalisation.h" - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// PhoneLocalisation::PhoneLocalisation -// ----------------------------------------------------------------------------- -// -PhoneLocalisation::PhoneLocalisation( - QObject * /*parent*/ ) - //: - //QObject( /*parent*/ ) - { - - } - - -// ----------------------------------------------------------------------------- -// PhoneLocalisation::~PhoneLocalisation -// ----------------------------------------------------------------------------- -// -PhoneLocalisation::~PhoneLocalisation( ) - { - - } - - -// ----------------------------------------------------------------------------- -// PhoneLocalisation::installTranslator -// ----------------------------------------------------------------------------- -// -bool PhoneLocalisation::installTranslator( - TranslationFileId translationFileId ) - { - SMC_MOCK_METHOD1( bool, TranslationFileId, translationFileId ) - } - - -// ----------------------------------------------------------------------------- -// PhoneLocalisation::removeTranslators -// ----------------------------------------------------------------------------- -// -void PhoneLocalisation::removeTranslators( ) - { - SMC_MOCK_METHOD0( void ) - } - - diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp --- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -144,7 +144,14 @@ SMC_MOCK_METHOD0( bool ) } - +// ----------------------------------------------------------------------------- +// SettingsWrapper::isConnectedToNetwork +// ----------------------------------------------------------------------------- +// +bool SettingsWrapper::isConnectedToNetwork( ) const + { + SMC_MOCK_METHOD0( bool ) + } // ----------------------------------------------------------------------------- // SettingsWrapper::isOngoingCall // ----------------------------------------------------------------------------- diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataform.cpp --- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataform.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataform.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -16,7 +16,11 @@ */ #include #include -#include "hbdataform.h" +#include + +#include +#include +#include // ============================ MEMBER FUNCTIONS =============================== @@ -27,6 +31,13 @@ HbAbstractItemViewPrivate* temp(NULL); HbAbstractItemContainer* temp2(NULL); +HbDataForm::HbDataForm( + QGraphicsItem *parent) + :HbAbstractItemView(*temp, temp2, 0, parent) +{ + +} + HbDataForm::HbDataForm( HbDataFormPrivate & /*dd*/, HbAbstractItemContainer * /*container*/, @@ -77,8 +88,8 @@ const QModelIndex & index, ScrollHint hint ) { - // SMC_MOCK_METHOD2( void, const QModelIndex &, index, - // ScrollHint, hint ) + SMC_MOCK_METHOD2( void, const QModelIndex &, index, + ScrollHint, hint ) } // ----------------------------------------------------------------------------- @@ -89,8 +100,8 @@ const QModelIndex & index, bool expanded ) { - // SMC_MOCK_METHOD2( void, const QModelIndex &, index, - // bool, expanded ) + SMC_MOCK_METHOD2( void, const QModelIndex &, index, + bool, expanded ) } @@ -101,7 +112,7 @@ bool HbDataForm::isExpanded( const QModelIndex & index ) const { - // SMC_MOCK_METHOD1( bool, const QModelIndex &, index ) + SMC_MOCK_METHOD1( bool, const QModelIndex &, index ) } @@ -154,7 +165,7 @@ QGraphicsItem * HbDataForm::primitive( HbStyle::Primitive primitive ) const { - // SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive ) + SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive ) } @@ -166,8 +177,8 @@ QAbstractItemModel * model, HbAbstractViewItem * prototype ) { -// SMC_MOCK_METHOD2( void, QAbstractItemModel *, model, - // HbAbstractViewItem *, prototype ) + SMC_MOCK_METHOD2( void, QAbstractItemModel *, model, + HbAbstractViewItem *, prototype ) } @@ -181,11 +192,11 @@ QObject * receiver, const char * slot ) { - /* SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, + SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, const char *, signal, QObject *, receiver, const char *, slot ) - */ } + } // ----------------------------------------------------------------------------- @@ -198,11 +209,11 @@ QObject * receiver, const char * slot ) { - /* SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, + SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, const char *, signal, QObject *, receiver, const char *, slot ) - */ } + } // ----------------------------------------------------------------------------- @@ -222,7 +233,7 @@ void HbDataForm::removeAllConnection( HbDataFormModelItem * item ) { -// SMC_MOCK_METHOD1( void, HbDataFormModelItem *, item ) + SMC_MOCK_METHOD1( void, HbDataFormModelItem *, item ) } @@ -233,7 +244,7 @@ void HbDataForm::itemShown( const QModelIndex & index ) { - // SMC_MOCK_METHOD1( void, const QModelIndex &, index ) + SMC_MOCK_METHOD1( void, const QModelIndex &, index ) } @@ -246,9 +257,9 @@ int start, int end ) { -// SMC_MOCK_METHOD3( void, const QModelIndex &, parent, - // int, start, - // int, end ) + SMC_MOCK_METHOD3( void, const QModelIndex &, parent, + int, start, + int, end ) } @@ -261,9 +272,9 @@ int start, int end ) { -// SMC_MOCK_METHOD3( void, const QModelIndex &, index, - // int, start, - // int, end ) + SMC_MOCK_METHOD3( void, const QModelIndex &, index, + int, start, + int, end ) } @@ -275,8 +286,8 @@ const QModelIndex & topLeft, const QModelIndex & bottomRight ) { - // SMC_MOCK_METHOD2( void, const QModelIndex &, topLeft, - // const QModelIndex &, bottomRight ) + SMC_MOCK_METHOD2( void, const QModelIndex &, topLeft, + const QModelIndex &, bottomRight ) } @@ -287,7 +298,7 @@ void HbDataForm::initStyleOption( HbStyleOptionDataForm * option ) { - // SMC_MOCK_METHOD1( void, HbStyleOptionDataForm *, option ) + //SMC_MOCK_METHOD1( void, HbStyleOptionDataForm *, option ) } diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataformmodel.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataformmodel.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,397 @@ +/** 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 the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbDataFormModel::HbDataFormModel +// ----------------------------------------------------------------------------- +// +HbDataFormModel::HbDataFormModel( + QObject * parent ) + //: + //QAbstractItemModel( /*parent*/ ) + :d_ptr(NULL) + { + + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::~HbDataFormModel +// ----------------------------------------------------------------------------- +// +HbDataFormModel::~HbDataFormModel( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::appendDataFormPage +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::appendDataFormPage( + const QString & label ) + { + SMC_MOCK_METHOD1( HbDataFormModelItem *, const QString &, label ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::appendDataFormGroup +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::appendDataFormGroup( + const QString & label, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD2( HbDataFormModelItem *, const QString &, label, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::appendDataFormGroupPage +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::appendDataFormGroupPage( + const QString & label, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD2( HbDataFormModelItem *, const QString &, label, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::appendDataFormItem +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::appendDataFormItem( + HbDataFormModelItem::DataItemType itemType, + const QString & label, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD3( HbDataFormModelItem *, HbDataFormModelItem::DataItemType, itemType, + const QString &, label, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::appendDataFormItem +// ----------------------------------------------------------------------------- +// +void HbDataFormModel::appendDataFormItem( + HbDataFormModelItem * data, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD2( void, HbDataFormModelItem *, data, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::insertDataFormPage +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::insertDataFormPage( + int index, + const QString & label ) + { + SMC_MOCK_METHOD2( HbDataFormModelItem *, int, index, + const QString &, label ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::insertDataFormGroup +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::insertDataFormGroup( + int index, + const QString & label, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD3( HbDataFormModelItem *, int, index, + const QString &, label, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::insertDataFormGroupPage +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::insertDataFormGroupPage( + int index, + const QString & label, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD3( HbDataFormModelItem *, int, index, + const QString &, label, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::insertDataFormItem +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::insertDataFormItem( + int index, + HbDataFormModelItem::DataItemType itemType, + const QString & label, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD4( HbDataFormModelItem *, int, index, + HbDataFormModelItem::DataItemType, itemType, + const QString &, label, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::insertDataFormItem +// ----------------------------------------------------------------------------- +// +void HbDataFormModel::insertDataFormItem( + int index, + HbDataFormModelItem * data, + HbDataFormModelItem * parent ) + { + SMC_MOCK_METHOD3( void, int, index, + HbDataFormModelItem *, data, + HbDataFormModelItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::removeItem +// ----------------------------------------------------------------------------- +// +bool HbDataFormModel::removeItem( + const QModelIndex & index ) + { + SMC_MOCK_METHOD1( bool, const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::removeItem +// ----------------------------------------------------------------------------- +// +bool HbDataFormModel::removeItem( + HbDataFormModelItem * item ) + { + SMC_MOCK_METHOD1( bool, HbDataFormModelItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::childCount +// ----------------------------------------------------------------------------- +// +int HbDataFormModel::childCount( + const QModelIndex & parent ) const + { + SMC_MOCK_METHOD1( int, const QModelIndex &, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::itemFromIndex +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::itemFromIndex( + const QModelIndex & index ) const + { + SMC_MOCK_METHOD1( HbDataFormModelItem *, const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::indexFromItem +// ----------------------------------------------------------------------------- +// +QModelIndex HbDataFormModel::indexFromItem( + const HbDataFormModelItem * item ) const + { + SMC_MOCK_METHOD1( QModelIndex, const HbDataFormModelItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::item +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::item( + int row, + const QModelIndex & index ) const + { + SMC_MOCK_METHOD2( HbDataFormModelItem *, int, row, + const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::invisibleRootItem +// ----------------------------------------------------------------------------- +// +HbDataFormModelItem * HbDataFormModel::invisibleRootItem( ) const + { + SMC_MOCK_METHOD0( HbDataFormModelItem * ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::clear +// ----------------------------------------------------------------------------- +// +void HbDataFormModel::clear( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::removeRows +// ----------------------------------------------------------------------------- +// +bool HbDataFormModel::removeRows( + int row, + int count, + const QModelIndex & index ) + { + SMC_MOCK_METHOD3( bool, int, row, + int, count, + const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::parent +// ----------------------------------------------------------------------------- +// +QModelIndex HbDataFormModel::parent( + const QModelIndex & index ) const + { + SMC_MOCK_METHOD1( QModelIndex, const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::index +// ----------------------------------------------------------------------------- +// +QModelIndex HbDataFormModel::index( + int row, + int column, + const QModelIndex & index ) const + { + SMC_MOCK_METHOD3( QModelIndex, int, row, + int, column, + const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::data +// ----------------------------------------------------------------------------- +// +QVariant HbDataFormModel::data( + const QModelIndex & index, + int role ) const + { + SMC_MOCK_METHOD2( QVariant, const QModelIndex &, index, + int, role ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::setData +// ----------------------------------------------------------------------------- +// +bool HbDataFormModel::setData( + const QModelIndex & index, + const QVariant & value, + int role ) + { + SMC_MOCK_METHOD3( bool, const QModelIndex &, index, + const QVariant &, value, + int, role ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::hasChildren +// ----------------------------------------------------------------------------- +// +bool HbDataFormModel::hasChildren( + const QModelIndex & index ) const + { + SMC_MOCK_METHOD1( bool, const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::rowCount +// ----------------------------------------------------------------------------- +// +int HbDataFormModel::rowCount( + const QModelIndex & index ) const + { + SMC_MOCK_METHOD1( int, const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::columnCount +// ----------------------------------------------------------------------------- +// +int HbDataFormModel::columnCount( + const QModelIndex & index ) const + { + SMC_MOCK_METHOD1( int, const QModelIndex &, index ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::canFetchMore +// ----------------------------------------------------------------------------- +// +bool HbDataFormModel::canFetchMore( + const QModelIndex & parent ) const + { + SMC_MOCK_METHOD1( bool, const QModelIndex &, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbDataFormModel::flags +// ----------------------------------------------------------------------------- +// +Qt::ItemFlags HbDataFormModel::flags( + const QModelIndex & index ) const + { + SMC_MOCK_METHOD1( Qt::ItemFlags, const QModelIndex &, index ) + } + + diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbtranslator.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbtranslator.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,75 @@ +/* +* 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 +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbTranslator::HbTranslator +// ----------------------------------------------------------------------------- +// +HbTranslator::HbTranslator( ) : d(NULL) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTranslator::HbTranslator +// ----------------------------------------------------------------------------- +// +HbTranslator::HbTranslator( + const QString & file ) : d(NULL) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTranslator::HbTranslator +// ----------------------------------------------------------------------------- +// +HbTranslator::HbTranslator( + const QString & path, + const QString & file ) : d(NULL) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTranslator::~HbTranslator +// ----------------------------------------------------------------------------- +// +HbTranslator::~HbTranslator( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTranslator::loadCommon +// ----------------------------------------------------------------------------- +// +void HbTranslator::loadCommon( ) + { + SMC_MOCK_METHOD0( void ) + } + + diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbview.cpp --- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbview.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbview.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -18,6 +18,13 @@ #include #include +#include +#include +#include +#include +#include + + // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -59,6 +66,7 @@ // HbIcon HbView::icon( ) const { + SMC_MOCK_METHOD0( HbIcon ) } @@ -67,8 +75,9 @@ // ----------------------------------------------------------------------------- // void HbView::setIcon( - const HbIcon & ) + const HbIcon & icon ) { + SMC_MOCK_METHOD1( void, const HbIcon &, icon ) } @@ -78,6 +87,7 @@ // HbMenu * HbView::menu( ) const { + SMC_MOCK_METHOD0( HbMenu * ) } @@ -86,8 +96,9 @@ // ----------------------------------------------------------------------------- // void HbView::setMenu( - HbMenu * ) + HbMenu * menu ) { + SMC_MOCK_METHOD1( void, HbMenu *, menu ) } @@ -97,6 +108,7 @@ // HbMenu * HbView::takeMenu( ) { + SMC_MOCK_METHOD0( HbMenu * ) } @@ -106,6 +118,7 @@ // HbToolBar * HbView::toolBar( ) const { + SMC_MOCK_METHOD0( HbToolBar * ) } @@ -114,8 +127,9 @@ // ----------------------------------------------------------------------------- // void HbView::setToolBar( - HbToolBar * ) + HbToolBar * toolBar ) { + SMC_MOCK_METHOD1( void, HbToolBar *, toolBar ) } @@ -125,6 +139,7 @@ // HbToolBar * HbView::takeToolBar( ) { + SMC_MOCK_METHOD0( HbToolBar * ) } @@ -134,6 +149,7 @@ // HbDockWidget * HbView::dockWidget( ) const { + SMC_MOCK_METHOD0( HbDockWidget * ) } @@ -142,8 +158,9 @@ // ----------------------------------------------------------------------------- // void HbView::setDockWidget( - HbDockWidget * ) + HbDockWidget * dockWidget ) { + SMC_MOCK_METHOD1( void, HbDockWidget *, dockWidget ) } @@ -153,6 +170,7 @@ // QGraphicsWidget * HbView::widget( ) const { + SMC_MOCK_METHOD0( QGraphicsWidget * ) } @@ -161,8 +179,9 @@ // ----------------------------------------------------------------------------- // void HbView::setWidget( - QGraphicsWidget * ) + QGraphicsWidget * widget ) { + SMC_MOCK_METHOD1( void, QGraphicsWidget *, widget ) } @@ -172,6 +191,7 @@ // QGraphicsWidget * HbView::takeWidget( ) { + SMC_MOCK_METHOD0( QGraphicsWidget * ) } @@ -180,8 +200,9 @@ // ----------------------------------------------------------------------------- // void HbView::showItems( - Hb::SceneItems ) + Hb::SceneItems /*items*/ ) { + //SMC_MOCK_METHOD1( void, Hb::SceneItems, items ) } @@ -190,8 +211,9 @@ // ----------------------------------------------------------------------------- // void HbView::hideItems( - Hb::SceneItems ) + Hb::SceneItems /*items*/ ) { + //SMC_MOCK_METHOD1( void, Hb::SceneItems, items ) } @@ -201,6 +223,7 @@ // Hb::SceneItems HbView::visibleItems( ) const { + SMC_MOCK_METHOD0( Hb::SceneItems ) } @@ -209,8 +232,9 @@ // ----------------------------------------------------------------------------- // bool HbView::isItemVisible( - Hb::SceneItem ) const + Hb::SceneItem /*item*/ ) const { + //SMC_MOCK_METHOD1( bool, Hb::SceneItem, item ) } @@ -219,11 +243,11 @@ // ----------------------------------------------------------------------------- // void HbView::setItemVisible( - Hb::SceneItem item, - bool visible ) + Hb::SceneItem /*item*/, + bool /*visible*/ ) { - SMC_MOCK_METHOD2( void, Hb::SceneItem, item, - bool, visible ) + /*SMC_MOCK_METHOD2( void, Hb::SceneItem, item, + bool, visible )*/ } @@ -243,7 +267,7 @@ // HbView::HbViewFlags HbView::viewFlags( ) const { - // SMC_MOCK_METHOD0( HbViewFlags ) + SMC_MOCK_METHOD0( HbView::HbViewFlags ) } @@ -275,11 +299,11 @@ // ----------------------------------------------------------------------------- // void HbView::addAction( - HbAction * action, + HbAction * actione, ActionContainer preferredActionContainer ) { - // SMC_MOCK_METHOD2( void, HbAction *, action, - // ActionContainer, preferredActionContainer ) + SMC_MOCK_METHOD2( void, HbAction *, actione, + ActionContainer, preferredActionContainer ) } @@ -298,9 +322,9 @@ // ----------------------------------------------------------------------------- // void HbView::setNavigationAction( - HbAction * action ) + HbAction * actione ) { - // SMC_MOCK_METHOD1( void, HbAction *, action ) + SMC_MOCK_METHOD1( void, HbAction *, actione ) } @@ -331,9 +355,9 @@ // ----------------------------------------------------------------------------- // void HbView::setViewFlags( - HbViewFlags flags ) + HbViewFlags /*flags*/ ) { - // SMC_MOCK_METHOD1( void, HbViewFlags, flags ) + //SMC_MOCK_METHOD1( void, HbViewFlags, flags ) } @@ -355,7 +379,7 @@ void HbView::iconChanged( const HbIcon & icon ) { - // SMC_MOCK_METHOD1( void, const HbIcon &, icon ) + SMC_MOCK_METHOD1( void, const HbIcon &, icon ) } @@ -420,7 +444,18 @@ bool HbView::event( QEvent * event ) { - // SMC_MOCK_METHOD1( bool, QEvent *, event ) + SMC_MOCK_METHOD1( bool, QEvent *, event ) } +// ----------------------------------------------------------------------------- +// HbView::changeEvent +// ----------------------------------------------------------------------------- +// +void HbView::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + diff -r cfea66083b62 -r baacf668fe89 phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro --- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro Mon Oct 04 16:06:10 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro Fri Oct 15 12:58:46 2010 +0300 @@ -49,7 +49,6 @@ ../../barringplugin/inc/*.h \ ../../cpnetworkplugin/src/*.h \ ../../cptelephonyutils/inc/cpplugincommon.h \ - ../../cptelephonyutils/inc/cpphonelocalisation.h \ ../../telephonyplugin/src/cptelephonypluginview.h \ /epoc32/include/platform/mw/psetwrapper.h \ /epoc32/include/platform/mw/psuinotes.h \ diff -r cfea66083b62 -r baacf668fe89 phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.cpp --- a/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -121,7 +121,7 @@ QPainterPath clip; qreal rounding = BubbbleImageRounding * HbDeviceProfile::profile(this).unitValue(); - clip.addRoundedRect(rect(), rounding, rounding); + clip.addRoundRect(rect(), rounding); painter->setClipPath(clip); #ifdef __WINS__ diff -r cfea66083b62 -r baacf668fe89 phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -38,7 +38,8 @@ void testCreateItem(); void testUpdateChildItems(); - + void testUpdateChildItemsFirstTime(); + private: BubbleParticipantListItem* mItem; HbMainWindow* mMainWindow; @@ -79,5 +80,24 @@ mItem->updateChildItems(); } +void ut_BubbleParticipantListItem::testUpdateChildItemsFirstTime() +{ + BubbleParticipantListItem* listItem = new BubbleParticipantListItem(); + mMainWindow->addView(listItem); + + // with two actions + HbAction act1("Action-1"); + HbAction act2("Action-2"); + listItem->addAction(&act1); + listItem->addAction(&act2); + + listItem->updateChildItems(); + + mMainWindow->show(); + QTest::qWait(300); // Give HbMainWindow time to complete show() function call. + + listItem->clearActions(); +} + BUBBLE_TEST_MAIN(ut_BubbleParticipantListItem) #include "ut_bubbleparticipantlistitem.moc" diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/bubblemanager/mock_bubblemanager2.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/bubblemanager/mock_bubblemanager2.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,522 @@ +/** 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 +#include +#include +#include "bubblemanager2.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// BubbleManager::BubbleManager +// ----------------------------------------------------------------------------- +// +BubbleManager::BubbleManager( + QGraphicsItem * parent ) + : HbWidget( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::~BubbleManager +// ----------------------------------------------------------------------------- +// +BubbleManager::~BubbleManager( ) + { + + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::startChanges +// ----------------------------------------------------------------------------- +// +void BubbleManager::startChanges( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::endChanges +// ----------------------------------------------------------------------------- +// +void BubbleManager::endChanges( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::createCallHeader +// ----------------------------------------------------------------------------- +// +int BubbleManager::createCallHeader( ) + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::removeCallHeader +// ----------------------------------------------------------------------------- +// +void BubbleManager::removeCallHeader( + int bubbleId ) + { + SMC_MOCK_METHOD1( void, int, bubbleId ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setState +// ----------------------------------------------------------------------------- +// +void BubbleManager::setState( + int bubbleId, + PhoneCallState state ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + PhoneCallState, state ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setLabel +// ----------------------------------------------------------------------------- +// +void BubbleManager::setLabel( + int bubbleId, + const QString & text, + Qt::TextElideMode clipDirection ) + { + SMC_MOCK_METHOD3( void, int, bubbleId, + const QString &, text, + Qt::TextElideMode, clipDirection ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setCli +// ----------------------------------------------------------------------------- +// +void BubbleManager::setCli( + int bubbleId, + const QString & cliText, + Qt::TextElideMode clipDirection ) + { + SMC_MOCK_METHOD3( void, int, bubbleId, + const QString &, cliText, + Qt::TextElideMode, clipDirection ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::updateCLI +// ----------------------------------------------------------------------------- +// +void BubbleManager::updateCLI( + int bubbleId, + const QString & cliText, + Qt::TextElideMode clipDirection ) + { + SMC_MOCK_METHOD3( void, int, bubbleId, + const QString &, cliText, + Qt::TextElideMode, clipDirection ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setSecondaryCli +// ----------------------------------------------------------------------------- +// +void BubbleManager::setSecondaryCli( + int bubbleId, + const QString & cliText, + Qt::TextElideMode clipDirection ) + { + SMC_MOCK_METHOD3( void, int, bubbleId, + const QString &, cliText, + Qt::TextElideMode, clipDirection ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setCallTime +// ----------------------------------------------------------------------------- +// +void BubbleManager::setCallTime( + int bubbleId, + const QString & callTime ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + const QString &, callTime ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::updateCallTime +// ----------------------------------------------------------------------------- +// +void BubbleManager::updateCallTime( + int bubbleId, + const QString & callTime ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + const QString &, callTime ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setCallObjectImage +// ----------------------------------------------------------------------------- +// +void BubbleManager::setCallObjectImage( + int bubbleId, + const QString & fileName ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + const QString &, fileName ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setCallObjectFromTheme +// ----------------------------------------------------------------------------- +// +void BubbleManager::setCallObjectFromTheme( + int bubbleId ) + { + SMC_MOCK_METHOD1( void, int, bubbleId ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setCallFlags +// ----------------------------------------------------------------------------- +// +void BubbleManager::setCallFlags( + int bubbleId, + int flags ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + int, flags ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setCallFlag +// ----------------------------------------------------------------------------- +// +void BubbleManager::setCallFlag( + int bubbleId, + PhoneCallFlags flag, + bool set ) + { + SMC_MOCK_METHOD3( void, int, bubbleId, + /*PhoneCallFlags*/int, flag, + bool, set ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setNumberType +// ----------------------------------------------------------------------------- +// +void BubbleManager::setNumberType( + int bubbleId, + PhoneNumberType type ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + PhoneNumberType, type ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setPhoneMuted +// ----------------------------------------------------------------------------- +// +void BubbleManager::setPhoneMuted( + bool muted ) + { + SMC_MOCK_METHOD1( void, bool, muted ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::createConference +// ----------------------------------------------------------------------------- +// +int BubbleManager::createConference( + int bubble1, + int bubble2 ) + { + SMC_MOCK_METHOD2( int, int, bubble1, + int, bubble2 ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::removeConference +// ----------------------------------------------------------------------------- +// +void BubbleManager::removeConference( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::addRowToConference +// ----------------------------------------------------------------------------- +// +void BubbleManager::addRowToConference( + int bubbleId ) + { + SMC_MOCK_METHOD1( void, int, bubbleId ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::removeRowFromConference +// ----------------------------------------------------------------------------- +// +void BubbleManager::removeRowFromConference( + int bubbleId ) + { + SMC_MOCK_METHOD1( void, int, bubbleId ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::conferenceRowCount +// ----------------------------------------------------------------------------- +// +int BubbleManager::conferenceRowCount( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setSelectionInConference +// ----------------------------------------------------------------------------- +// +void BubbleManager::setSelectionInConference( + int rowNumber ) + { + SMC_MOCK_METHOD1( void, int, rowNumber ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setSelectionIdInConference +// ----------------------------------------------------------------------------- +// +void BubbleManager::setSelectionIdInConference( + int bubbleId ) + { + SMC_MOCK_METHOD1( void, int, bubbleId ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::selectionInConference +// ----------------------------------------------------------------------------- +// +int BubbleManager::selectionInConference( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::selectionIdInConference +// ----------------------------------------------------------------------------- +// +int BubbleManager::selectionIdInConference( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::moveHighlightOneUpInConference +// ----------------------------------------------------------------------------- +// +void BubbleManager::moveHighlightOneUpInConference( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::moveHighlightOneDownInConference +// ----------------------------------------------------------------------------- +// +void BubbleManager::moveHighlightOneDownInConference( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setExpandedConferenceCallHeader +// ----------------------------------------------------------------------------- +// +void BubbleManager::setExpandedConferenceCallHeader( + bool expanded ) + { + SMC_MOCK_METHOD1( void, bool, expanded ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::isConferenceExpanded +// ----------------------------------------------------------------------------- +// +bool BubbleManager::isConferenceExpanded( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::shownHeaderCount +// ----------------------------------------------------------------------------- +// +int BubbleManager::shownHeaderCount( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setParticipantListCli +// ----------------------------------------------------------------------------- +// +void BubbleManager::setParticipantListCli( + int aBubbleId, + ParticipantListCli aParticipantCli ) + { + SMC_MOCK_METHOD2( void, int, aBubbleId, + ParticipantListCli, aParticipantCli ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::addAction +// ----------------------------------------------------------------------------- +// +void BubbleManager::addAction( + int bubbleId, + HbAction * a ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + HbAction *, a ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::clearActions +// ----------------------------------------------------------------------------- +// +void BubbleManager::clearActions( + int bubbleId ) + { + SMC_MOCK_METHOD1( void, int, bubbleId ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::graphicsWidgetForAction +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * BubbleManager::graphicsWidgetForAction( + HbAction * a ) const + { + SMC_MOCK_METHOD1( QGraphicsWidget *, HbAction *, a ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::addParticipantListAction +// ----------------------------------------------------------------------------- +// +void BubbleManager::addParticipantListAction( + HbAction * a ) + { + SMC_MOCK_METHOD1( void, HbAction *, a ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::clearParticipantListActions +// ----------------------------------------------------------------------------- +// +void BubbleManager::clearParticipantListActions( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::expandedBubble +// ----------------------------------------------------------------------------- +// +int BubbleManager::expandedBubble( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setExpandAction +// ----------------------------------------------------------------------------- +// +void BubbleManager::setExpandAction( + int bubbleId, + HbAction * a ) + { + SMC_MOCK_METHOD2( void, int, bubbleId, + HbAction *, a ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::setBubbleSelectionDisabled +// ----------------------------------------------------------------------------- +// +void BubbleManager::setBubbleSelectionDisabled( + bool disabled ) + { + SMC_MOCK_METHOD1( void, bool, disabled ) + } + + +// ----------------------------------------------------------------------------- +// BubbleManager::handleOrientationChange +// ----------------------------------------------------------------------------- +// +void BubbleManager::handleOrientationChange( + Qt::Orientation orientation ) + { + SMC_MOCK_METHOD1( void, Qt::Orientation, orientation ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/mock_aknkeylock.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/mock_aknkeylock.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,121 @@ +/** 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 +#include "aknkeylock.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// RAknKeylock2::Connect +// ----------------------------------------------------------------------------- +// +TInt RAknKeylock2::Connect( ) + { + SMC_MOCK_METHOD0( TInt ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::EnableKeyLock +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::EnableKeyLock( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::DisableKeyLock +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::DisableKeyLock( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::IsKeyLockEnabled +// ----------------------------------------------------------------------------- +// +TBool RAknKeyLock::IsKeyLockEnabled( ) + { + SMC_MOCK_METHOD0( TBool ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::EnableSoftNotifications +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::EnableSoftNotifications( + TBool aEnable ) + { + SMC_MOCK_METHOD1( void, TBool, aEnable ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::OfferKeyLock +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::OfferKeyLock( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::CancelAllNotifications +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::CancelAllNotifications( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::EnableAutoLockEmulation +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::EnableAutoLockEmulation( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::DisableWithoutNote +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::DisableWithoutNote( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RAknKeyLock::EnableWithoutNote +// ----------------------------------------------------------------------------- +// +void RAknKeyLock::EnableWithoutNote( ) + { + SMC_MOCK_METHOD0( void ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/mock_featmgr.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/mock_featmgr.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,61 @@ +/** 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 +#include "featmgr.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// FeatureManager::FeatureManager +// ----------------------------------------------------------------------------- +// +FeatureManager::FeatureManager( ) + { + + } + + +// ----------------------------------------------------------------------------- +// FeatureManager::InitializeLibL +// ----------------------------------------------------------------------------- +// +void FeatureManager::InitializeLibL( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// FeatureManager::UnInitializeLib +// ----------------------------------------------------------------------------- +// +void FeatureManager::UnInitializeLib( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// FeatureManager::FeatureSupported +// ----------------------------------------------------------------------------- +// +TBool FeatureManager::FeatureSupported( + TInt aFeature ) + { + SMC_MOCK_METHOD1( TBool, TInt, aFeature ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbabstractedit.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbabstractedit.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,935 @@ +/** 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 +#include +#include +#include +#include +#include +#include "hbabstractedit.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::HbAbstractEdit +// ----------------------------------------------------------------------------- +// +HbAbstractEdit::HbAbstractEdit( + QGraphicsItem * parent ) : + HbWidget(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::~HbAbstractEdit +// ----------------------------------------------------------------------------- +// +HbAbstractEdit::~HbAbstractEdit( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::isReadOnly +// ----------------------------------------------------------------------------- +// +bool HbAbstractEdit::isReadOnly( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setReadOnly +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setReadOnly( + bool value ) + { + SMC_MOCK_METHOD1( void, bool, value ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::cursorPosition +// ----------------------------------------------------------------------------- +// +int HbAbstractEdit::cursorPosition( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::cursorVisibility +// ----------------------------------------------------------------------------- +// +Hb::TextCursorVisibility HbAbstractEdit::cursorVisibility( ) const + { + SMC_MOCK_METHOD0( Hb::TextCursorVisibility ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setCursorVisibility +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setCursorVisibility( + Hb::TextCursorVisibility value ) + { + SMC_MOCK_METHOD1( void, Hb::TextCursorVisibility, value ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::validator +// ----------------------------------------------------------------------------- +// +HbValidator * HbAbstractEdit::validator( ) const + { + SMC_MOCK_METHOD0( HbValidator * ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setValidator +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setValidator( + HbValidator * validator ) + { + SMC_MOCK_METHOD1( void, HbValidator *, validator ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::hasAcceptableInput +// ----------------------------------------------------------------------------- +// +bool HbAbstractEdit::hasAcceptableInput( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::primitive +// ----------------------------------------------------------------------------- +// +QGraphicsItem * HbAbstractEdit::primitive( + HbStyle::Primitive primitive ) const + { + SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::event +// ----------------------------------------------------------------------------- +// +bool HbAbstractEdit::event( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::type +// ----------------------------------------------------------------------------- +// +int HbAbstractEdit::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setAlignment +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setAlignment( + Qt::Alignment alignment ) + { + SMC_MOCK_METHOD1( void, /*Qt::Alignment*/int, alignment ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::alignment +// ----------------------------------------------------------------------------- +// +Qt::Alignment HbAbstractEdit::alignment( ) const + { + SMC_MOCK_METHOD0( Qt::Alignment ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::contextMenuFlags +// ----------------------------------------------------------------------------- +// +Hb::TextContextMenuFlags HbAbstractEdit::contextMenuFlags( ) const + { + SMC_MOCK_METHOD0( Hb::TextContextMenuFlags ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setContextMenuFlags +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setContextMenuFlags( + Hb::TextContextMenuFlags flags ) + { + SMC_MOCK_METHOD1( void, /*Hb::TextContextMenuFlags*/int, flags ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setContextMenuFlag +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setContextMenuFlag( + Hb::TextContextMenuFlag flag ) + { + SMC_MOCK_METHOD1( void, Hb::TextContextMenuFlag, flag ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::clearContextMenuFlag +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::clearContextMenuFlag( + Hb::TextContextMenuFlag flag ) + { + SMC_MOCK_METHOD1( void, Hb::TextContextMenuFlag, flag ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::placeholderText +// ----------------------------------------------------------------------------- +// +QString HbAbstractEdit::placeholderText( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setPlaceholderText +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setPlaceholderText( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::anchorAt +// ----------------------------------------------------------------------------- +// +QString HbAbstractEdit::anchorAt( + const QPointF & pos ) const + { + SMC_MOCK_METHOD1( QString, const QPointF &, pos ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::anchorAt +// ----------------------------------------------------------------------------- +// +QString HbAbstractEdit::anchorAt( + int pos ) const + { + SMC_MOCK_METHOD1( QString, int, pos ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setSmileyTheme +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setSmileyTheme( + const HbSmileyTheme & theme ) + { + SMC_MOCK_METHOD1( void, const HbSmileyTheme &, theme ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::smileyTheme +// ----------------------------------------------------------------------------- +// +HbSmileyTheme HbAbstractEdit::smileyTheme( ) const + { + SMC_MOCK_METHOD0( HbSmileyTheme ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::defaultSmileyTheme +// ----------------------------------------------------------------------------- +// +HbSmileyTheme HbAbstractEdit::defaultSmileyTheme( ) const + { + SMC_MOCK_METHOD0( HbSmileyTheme ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::resetSmileyTheme +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::resetSmileyTheme( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::isSmileysEnabled +// ----------------------------------------------------------------------------- +// +bool HbAbstractEdit::isSmileysEnabled( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setSmileysEnabled +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setSmileysEnabled( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setFormatDialog +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setFormatDialog( + HbFormatDialogPointer dialog ) + { + SMC_MOCK_METHOD1( void, HbFormatDialogPointer, dialog ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::characterAt +// ----------------------------------------------------------------------------- +// +QChar HbAbstractEdit::characterAt( + int pos ) const + { + SMC_MOCK_METHOD1( QChar, int, pos ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::contentsChanged +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::contentsChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::cursorPositionChanged +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::cursorPositionChanged( + int oldPos, + int newPos ) + { + SMC_MOCK_METHOD2( void, int, oldPos, + int, newPos ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::selectionChanged +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::selectionChanged( + const QTextCursor & oldCursor, + const QTextCursor & newCursor ) + { + SMC_MOCK_METHOD2( void, const QTextCursor &, oldCursor, + const QTextCursor &, newCursor ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::aboutToShowContextMenu +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::aboutToShowContextMenu( + HbMenu * contextMenu, + const QPointF & pos ) + { + SMC_MOCK_METHOD2( void, HbMenu *, contextMenu, + const QPointF &, pos ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::anchorTapped +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::anchorTapped( + const QString & anchor ) + { + SMC_MOCK_METHOD1( void, const QString &, anchor ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::updatePrimitives +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::updatePrimitives( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setCursorPosition +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setCursorPosition( + int pos, + QTextCursor::MoveMode mode ) + { + SMC_MOCK_METHOD2( void, int, pos, + QTextCursor::MoveMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::cut +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::cut( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::copy +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::copy( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::paste +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::paste( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::selectClickedWord +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::selectClickedWord( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::selectAll +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::selectAll( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::deselect +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::deselect( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::format +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::format( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::HbAbstractEdit +// ----------------------------------------------------------------------------- +// +HbAbstractEdit::HbAbstractEdit( + HbAbstractEditPrivate & dd, + QGraphicsItem * parent ) : + HbWidget(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::drawContents +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::drawContents( + QPainter * painter, + const QStyleOptionGraphicsItem & option ) + { + SMC_MOCK_METHOD2( void, QPainter *, painter, + const QStyleOptionGraphicsItem &, option ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::resizeEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::resizeEvent( + QGraphicsSceneResizeEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::inputMethodEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::inputMethodEvent( + QInputMethodEvent * event ) + { + SMC_MOCK_METHOD1( void, QInputMethodEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::inputMethodQuery +// ----------------------------------------------------------------------------- +// +QVariant HbAbstractEdit::inputMethodQuery( + Qt::InputMethodQuery query ) const + { + SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, query ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::keyPressEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::keyPressEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::keyReleaseEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::keyReleaseEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::focusInEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::focusInEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::focusOutEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::focusOutEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::changeEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::hideEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::hideEvent( + QHideEvent * event ) + { + SMC_MOCK_METHOD1( void, QHideEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setDocument +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setDocument( + QTextDocument * document ) + { + SMC_MOCK_METHOD1( void, QTextDocument *, document ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::document +// ----------------------------------------------------------------------------- +// +QTextDocument * HbAbstractEdit::document( ) const + { + SMC_MOCK_METHOD0( QTextDocument * ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setTextCursor +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setTextCursor( + const QTextCursor & cursor ) + { + SMC_MOCK_METHOD1( void, const QTextCursor &, cursor ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::textCursor +// ----------------------------------------------------------------------------- +// +QTextCursor HbAbstractEdit::textCursor( ) const + { + SMC_MOCK_METHOD0( QTextCursor ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::toPlainText +// ----------------------------------------------------------------------------- +// +QString HbAbstractEdit::toPlainText( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::toHtml +// ----------------------------------------------------------------------------- +// +QString HbAbstractEdit::toHtml( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::moveCursor +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::moveCursor( + QTextCursor::MoveOperation op, + QTextCursor::MoveMode mode ) + { + SMC_MOCK_METHOD2( void, QTextCursor::MoveOperation, op, + QTextCursor::MoveMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::blockBoundingRect +// ----------------------------------------------------------------------------- +// +QRectF HbAbstractEdit::blockBoundingRect( + const QTextBlock & block ) const + { + SMC_MOCK_METHOD1( QRectF, const QTextBlock &, block ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::isScrollable +// ----------------------------------------------------------------------------- +// +bool HbAbstractEdit::isScrollable( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setScrollable +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setScrollable( + bool value ) + { + SMC_MOCK_METHOD1( void, bool, value ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::scrollArea +// ----------------------------------------------------------------------------- +// +HbScrollArea * HbAbstractEdit::scrollArea( ) const + { + SMC_MOCK_METHOD0( HbScrollArea * ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::createContextMenu +// ----------------------------------------------------------------------------- +// +HbMenu * HbAbstractEdit::createContextMenu( ) + { + SMC_MOCK_METHOD0( HbMenu * ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::showContextMenu +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::showContextMenu( + QPointF position ) + { + SMC_MOCK_METHOD1( void, QPointF, position ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::createMimeDataFromSelection +// ----------------------------------------------------------------------------- +// +QMimeData * HbAbstractEdit::createMimeDataFromSelection( ) const + { + SMC_MOCK_METHOD0( QMimeData * ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::filterInputText +// ----------------------------------------------------------------------------- +// +QString HbAbstractEdit::filterInputText( + const QString & text ) + { + SMC_MOCK_METHOD1( QString, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::canInsertFromMimeData +// ----------------------------------------------------------------------------- +// +bool HbAbstractEdit::canInsertFromMimeData( + const QMimeData * source ) const + { + SMC_MOCK_METHOD1( bool, const QMimeData *, source ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::insertFromMimeData +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::insertFromMimeData( + const QMimeData * source ) + { + SMC_MOCK_METHOD1( void, const QMimeData *, source ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::rectForPosition +// ----------------------------------------------------------------------------- +// +QRectF HbAbstractEdit::rectForPosition( + int position, + QTextLine::Edge edge ) const + { + SMC_MOCK_METHOD2( QRectF, int, position, + QTextLine::Edge, edge ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::updateGeometry +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::updateGeometry( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::polish +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::polish( + HbStyleParameters & params ) + { + SMC_MOCK_METHOD1( void, HbStyleParameters &, params ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::itemChange +// ----------------------------------------------------------------------------- +// +QVariant HbAbstractEdit::itemChange( + GraphicsItemChange change, + const QVariant & value ) + { + SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::gestureEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::gestureEvent( + QGestureEvent * e ) + { + SMC_MOCK_METHOD1( void, QGestureEvent *, e ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setPlainText +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setPlainText( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::setHtml +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::setHtml( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::documentLayoutChanged +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::documentLayoutChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::documentSizeChanged +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::documentSizeChanged( + const QSizeF & size ) + { + SMC_MOCK_METHOD1( void, const QSizeF &, size ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::blockCountChanged +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::blockCountChanged( + int newBlockCount ) + { + SMC_MOCK_METHOD1( void, int, newBlockCount ) + } + + +// ----------------------------------------------------------------------------- +// HbAbstractEdit::timerEvent +// ----------------------------------------------------------------------------- +// +void HbAbstractEdit::timerEvent( + QTimerEvent * e ) + { + SMC_MOCK_METHOD1( void, QTimerEvent *, e ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbaction.cpp --- a/tsrc/mocks/orbit/mock_hbaction.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/tsrc/mocks/orbit/mock_hbaction.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -59,6 +59,14 @@ } +// ----------------------------------------------------------------------------- +// HbAction::HbAction +// ----------------------------------------------------------------------------- +// +HbAction::HbAction(QObject *parent) : QAction( parent ), d_ptr(NULL) + { + + } // ----------------------------------------------------------------------------- // HbAction::~HbAction diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbdeviceprofile.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbdeviceprofile.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,224 @@ +/** 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 +#include +#include +#include +#include +#include + +// NOTE! The following header include requires +// INCLUDEPATH += /sf/mw/hb/include/hbcore/private +//#include +class HbDeviceProfilePrivate : public QSharedData {}; + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::HbDeviceProfile +// ----------------------------------------------------------------------------- +// +HbDeviceProfile::HbDeviceProfile( ) + { + //SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::HbDeviceProfile +// ----------------------------------------------------------------------------- +// +HbDeviceProfile::HbDeviceProfile( + const HbDeviceProfile & /*other*/ ) + { + //SMC_MOCK_METHOD1( void, const HbDeviceProfile &, other ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::HbDeviceProfile +// ----------------------------------------------------------------------------- +// +HbDeviceProfile::HbDeviceProfile( + const QString & /*name*/ ) + { + //SMC_MOCK_METHOD1( void, const QString &, name ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::~HbDeviceProfile +// ----------------------------------------------------------------------------- +// +HbDeviceProfile::~HbDeviceProfile( ) + { + //SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::= +// ----------------------------------------------------------------------------- +// +HbDeviceProfile & HbDeviceProfile::operator=( + const HbDeviceProfile & other ) + { + SMC_MOCK_METHOD1( HbDeviceProfile &, const HbDeviceProfile &, other ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::isNull +// ----------------------------------------------------------------------------- +// +bool HbDeviceProfile::isNull( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::name +// ----------------------------------------------------------------------------- +// +QString HbDeviceProfile::name( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::logicalSize +// ----------------------------------------------------------------------------- +// +QSize HbDeviceProfile::logicalSize( ) const + { + SMC_MOCK_METHOD0( QSize ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::physicalSize +// ----------------------------------------------------------------------------- +// +QSizeF HbDeviceProfile::physicalSize( ) const + { + SMC_MOCK_METHOD0( QSizeF ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::alternateProfileName +// ----------------------------------------------------------------------------- +// +QString HbDeviceProfile::alternateProfileName( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::touch +// ----------------------------------------------------------------------------- +// +bool HbDeviceProfile::touch( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::orientation +// ----------------------------------------------------------------------------- +// +Qt::Orientation HbDeviceProfile::orientation( ) const + { + SMC_MOCK_METHOD0( Qt::Orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::orientationAngle +// ----------------------------------------------------------------------------- +// +qreal HbDeviceProfile::orientationAngle( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::unitValue +// ----------------------------------------------------------------------------- +// +qreal HbDeviceProfile::unitValue( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::ppmValue +// ----------------------------------------------------------------------------- +// +qreal HbDeviceProfile::ppmValue( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::current +// ----------------------------------------------------------------------------- +// +HbDeviceProfile HbDeviceProfile::current( ) + { + SMC_MOCK_METHOD0( HbDeviceProfile ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::profile +// ----------------------------------------------------------------------------- +// +HbDeviceProfile HbDeviceProfile::profile( + const HbMainWindow * window ) + { + SMC_MOCK_METHOD1( HbDeviceProfile, const HbMainWindow *, window ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::profile +// ----------------------------------------------------------------------------- +// +HbDeviceProfile HbDeviceProfile::profile( + const QGraphicsItem * item ) + { + SMC_MOCK_METHOD1( HbDeviceProfile, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// HbDeviceProfile::profileNames +// ----------------------------------------------------------------------------- +// +QStringList HbDeviceProfile::profileNames( ) + { + SMC_MOCK_METHOD0( QStringList ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbdialog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbdialog.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,194 @@ +/* +* 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 +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbDialog::HbDialog +// ----------------------------------------------------------------------------- +// +HbDialog::HbDialog( + QGraphicsItem * parent ) + : HbPopup( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbDialog::~HbDialog +// ----------------------------------------------------------------------------- +// +HbDialog::~HbDialog( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbDialog::headingWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * HbDialog::headingWidget( ) const + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::setHeadingWidget +// ----------------------------------------------------------------------------- +// +void HbDialog::setHeadingWidget( + QGraphicsWidget * headingWidget ) + { + SMC_MOCK_METHOD1( void, QGraphicsWidget *, headingWidget ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::contentWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * HbDialog::contentWidget( ) const + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::setContentWidget +// ----------------------------------------------------------------------------- +// +void HbDialog::setContentWidget( + QGraphicsWidget * contentWidget ) + { + SMC_MOCK_METHOD1( void, QGraphicsWidget *, contentWidget ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::primaryAction +// ----------------------------------------------------------------------------- +// +HbAction * HbDialog::primaryAction( ) const + { + SMC_MOCK_METHOD0( HbAction * ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::setPrimaryAction +// ----------------------------------------------------------------------------- +// +void HbDialog::setPrimaryAction( + HbAction * action ) + { + //SMC_MOCK_METHOD1( void, HbAction *, action ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::secondaryAction +// ----------------------------------------------------------------------------- +// +HbAction * HbDialog::secondaryAction( ) const + { + // SMC_MOCK_METHOD0( HbAction * ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::setSecondaryAction +// ----------------------------------------------------------------------------- +// +void HbDialog::setSecondaryAction( + HbAction * action ) + { + // SMC_MOCK_METHOD1( void, HbAction *, action ) + } + +// ----------------------------------------------------------------------------- +// HbDialog::HbDialog +// ----------------------------------------------------------------------------- +// +HbDialog::HbDialog( + HbDialogPrivate & dd, + QGraphicsItem * parent ) + //: + //HbPopup( /*dd, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbDialog::focusInEvent +// ----------------------------------------------------------------------------- +// +void HbDialog::focusInEvent( + QFocusEvent * event ) + { + // SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::closeEvent +// ----------------------------------------------------------------------------- +// +void HbDialog::closeEvent( + QCloseEvent * event ) + { + // SMC_MOCK_METHOD1( void, QCloseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::changeEvent +// ----------------------------------------------------------------------------- +// +void HbDialog::changeEvent( + QEvent * event ) + { + // SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbDialog::event +// ----------------------------------------------------------------------------- +// +bool HbDialog::event( + QEvent * event ) + { + // SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + +// ----------------------------------------------------------------------------- +// HbDialog::open +// ----------------------------------------------------------------------------- +// +void HbDialog::open( QObject* receiver, const char* member ) + { + SMC_MOCK_METHOD2( void, QObject *, receiver, const char*, member ) + } + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbframedrawer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbframedrawer.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,346 @@ +/** 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 +#include +#include +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::HbFrameDrawer +// ----------------------------------------------------------------------------- +// +HbFrameDrawer::HbFrameDrawer( + bool /*cacheFlag*/ ) + { + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::HbFrameDrawer +// ----------------------------------------------------------------------------- +// +HbFrameDrawer::HbFrameDrawer( + const QString & /*frameGraphicsName*/, + FrameType /*type*/, + bool /*cacheFlag*/ ) + { + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::~HbFrameDrawer +// ----------------------------------------------------------------------------- +// +HbFrameDrawer::~HbFrameDrawer( ) + { + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::isNull +// ----------------------------------------------------------------------------- +// +bool HbFrameDrawer::isNull( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::frameGraphicsName +// ----------------------------------------------------------------------------- +// +QString HbFrameDrawer::frameGraphicsName( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setFrameGraphicsName +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setFrameGraphicsName( + const QString & frameGraphicsName ) + { + SMC_MOCK_METHOD1( void, const QString &, frameGraphicsName ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::frameType +// ----------------------------------------------------------------------------- +// +HbFrameDrawer::FrameType HbFrameDrawer::frameType() const + { + SMC_MOCK_METHOD0( FrameType ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setFrameType +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setFrameType( + HbFrameDrawer::FrameType type ) + { + SMC_MOCK_METHOD1( void, FrameType, type ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::borderWidths +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::borderWidths( + qreal & left, + qreal & top, + qreal & right, + qreal & bottom ) const + { + SMC_MOCK_METHOD4( void, qreal &, left, + qreal &, top, + qreal &, right, + qreal &, bottom ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setBorderWidths +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setBorderWidths( + const qreal left, + const qreal top, + const qreal right, + const qreal bottom ) + { + SMC_MOCK_METHOD4( void, const qreal, left, + const qreal, top, + const qreal, right, + const qreal, bottom ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setBorderWidths +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setBorderWidths( + const qreal horizontal, + const qreal vertical ) + { + SMC_MOCK_METHOD2( void, const qreal, horizontal, + const qreal, vertical ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setBorderWidth +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setBorderWidth( + const qreal width ) + { + SMC_MOCK_METHOD1( void, const qreal, width ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::fillWholeRect +// ----------------------------------------------------------------------------- +// +bool HbFrameDrawer::fillWholeRect( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setFillWholeRect +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setFillWholeRect( + bool fill ) + { + SMC_MOCK_METHOD1( void, bool, fill ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::mirroringMode +// ----------------------------------------------------------------------------- +// +HbIcon::MirroringMode HbFrameDrawer::mirroringMode( ) const + { + SMC_MOCK_METHOD0( HbIcon::MirroringMode ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setMirroringMode +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setMirroringMode( + HbIcon::MirroringMode mode ) + { + SMC_MOCK_METHOD1( void, HbIcon::MirroringMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::fileNameSuffixList +// ----------------------------------------------------------------------------- +// +QStringList HbFrameDrawer::fileNameSuffixList( ) const + { + SMC_MOCK_METHOD0( QStringList ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setFileNameSuffixList +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setFileNameSuffixList( + const QStringList & list ) + { + SMC_MOCK_METHOD1( void, const QStringList &, list ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setMask +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setMask( + const QPixmap & mask ) + { + SMC_MOCK_METHOD1( void, const QPixmap &, mask ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setMask +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setMask( + const QBitmap & mask ) + { + SMC_MOCK_METHOD1( void, const QBitmap &, mask ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::mask +// ----------------------------------------------------------------------------- +// +QPixmap HbFrameDrawer::mask( ) const + { + SMC_MOCK_METHOD0( QPixmap ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::maskBitmap +// ----------------------------------------------------------------------------- +// +QBitmap HbFrameDrawer::maskBitmap( ) const + { + SMC_MOCK_METHOD0( QBitmap ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::frameSize +// ----------------------------------------------------------------------------- +// +QSize HbFrameDrawer::frameSize( ) const + { + SMC_MOCK_METHOD0( QSize ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::themeChanged +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::themeChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setLayoutDirection +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setLayoutDirection( + Qt::LayoutDirection direction ) + { + SMC_MOCK_METHOD1( void, Qt::LayoutDirection, direction ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setGraphicsItem +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setGraphicsItem( + QGraphicsItem * item ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::paint +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::paint( + QPainter * painter, + const QRectF & rect ) const + { + SMC_MOCK_METHOD2( void, QPainter *, painter, + const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::rect +// ----------------------------------------------------------------------------- +// +QRectF HbFrameDrawer::rect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameDrawer::setRect +// ----------------------------------------------------------------------------- +// +void HbFrameDrawer::setRect( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbframeitem.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbframeitem.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,127 @@ +/* +* 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 +#include +#include +#include +#include +#include "hbframeitem.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbFrameItem::HbFrameItem +// ----------------------------------------------------------------------------- +// +HbFrameItem::HbFrameItem( + QGraphicsItem * parent ) + { + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::HbFrameItem +// ----------------------------------------------------------------------------- +// +HbFrameItem::HbFrameItem( + HbFrameDrawer * drawer, + QGraphicsItem * parent ) + { + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::HbFrameItem +// ----------------------------------------------------------------------------- +// +HbFrameItem::HbFrameItem( + const QString & frameGraphicsName, + HbFrameDrawer::FrameType frameGraphicsType, + QGraphicsItem * parent ) + { + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::~HbFrameItem +// ----------------------------------------------------------------------------- +// +HbFrameItem::~HbFrameItem( ) + { + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::frameDrawer +// ----------------------------------------------------------------------------- +// +HbFrameDrawer & HbFrameItem::frameDrawer( ) const + { + SMC_MOCK_METHOD0( HbFrameDrawer & ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::setFrameDrawer +// ----------------------------------------------------------------------------- +// +void HbFrameItem::setFrameDrawer( + HbFrameDrawer * drawer ) + { + SMC_MOCK_METHOD1( void, HbFrameDrawer *, drawer ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::paint +// ----------------------------------------------------------------------------- +// +void HbFrameItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::changeEvent +// ----------------------------------------------------------------------------- +// +void HbFrameItem::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbFrameItem::sizeHint +// ----------------------------------------------------------------------------- +// +QSizeF HbFrameItem::sizeHint( + Qt::SizeHint which, + const QSizeF & constraint ) const + { + SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which, + const QSizeF &, constraint ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbinstantfeedback.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbinstantfeedback.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,151 @@ +/** 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 +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::HbInstantFeedback +// ----------------------------------------------------------------------------- +// +HbInstantFeedback::HbInstantFeedback( ) + //: + //HbAbstractFeedback( /**/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::HbInstantFeedback +// ----------------------------------------------------------------------------- +// +HbInstantFeedback::HbInstantFeedback( + HbFeedback::InstantEffect /*effect*/ ) + //: + //HbAbstractFeedback( /*effect*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::~HbInstantFeedback +// ----------------------------------------------------------------------------- +// +HbInstantFeedback::~HbInstantFeedback( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::play +// ----------------------------------------------------------------------------- +// +void HbInstantFeedback::play( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::play +// ----------------------------------------------------------------------------- +// +void HbInstantFeedback::play( + HbFeedback::InstantEffect effect ) + { + SMC_MOCK_METHOD1( void, HbFeedback::InstantEffect, effect ) + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::type +// ----------------------------------------------------------------------------- +// +/*HbFeedback::Type HbInstantFeedback::type( ) const + { + SMC_MOCK_METHOD0( HbFeedback::Type ) + } +*/ + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::isValid +// ----------------------------------------------------------------------------- +// +bool HbInstantFeedback::isValid( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::instantEffect +// ----------------------------------------------------------------------------- +// +HbFeedback::InstantEffect HbInstantFeedback::instantEffect( ) const + { + SMC_MOCK_METHOD0( HbFeedback::InstantEffect ) + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::setInstantEffect +// ----------------------------------------------------------------------------- +// +void HbInstantFeedback::setInstantEffect( + HbFeedback::InstantEffect effect ) + { + SMC_MOCK_METHOD1( void, HbFeedback::InstantEffect, effect ) + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::operator= +// ----------------------------------------------------------------------------- +// +HbInstantFeedback & HbInstantFeedback::operator=( + const HbInstantFeedback & feedback ) + { + SMC_MOCK_METHOD1( HbInstantFeedback &, const HbInstantFeedback &, feedback ) + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::operator== +// ----------------------------------------------------------------------------- +// +bool HbInstantFeedback::operator==( + const HbInstantFeedback & feedback ) const + { + SMC_MOCK_METHOD1( bool, const HbInstantFeedback &, feedback ) + } + + +// ----------------------------------------------------------------------------- +// HbInstantFeedback::operator!= +// ----------------------------------------------------------------------------- +// +bool HbInstantFeedback::operator!=( + const HbInstantFeedback & feedback ) const + { + SMC_MOCK_METHOD1( bool, const HbInstantFeedback &, feedback ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hblineedit.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hblineedit.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,452 @@ +/** 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 +#include "hblineedit.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbLineEdit::HbLineEdit +// ----------------------------------------------------------------------------- +// +HbLineEdit::HbLineEdit( + QGraphicsItem * parent ) : + HbAbstractEdit(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::HbLineEdit +// ----------------------------------------------------------------------------- +// +HbLineEdit::HbLineEdit( + const QString & text, + QGraphicsItem * parent ) : + HbAbstractEdit(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::~HbLineEdit +// ----------------------------------------------------------------------------- +// +HbLineEdit::~HbLineEdit( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::type +// ----------------------------------------------------------------------------- +// +int HbLineEdit::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::maxLength +// ----------------------------------------------------------------------------- +// +int HbLineEdit::maxLength( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setMaxLength +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setMaxLength( + int length ) + { + SMC_MOCK_METHOD1( void, int, length ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setMinRows +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setMinRows( + int rows ) + { + SMC_MOCK_METHOD1( void, int, rows ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::minRows +// ----------------------------------------------------------------------------- +// +int HbLineEdit::minRows( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setMaxRows +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setMaxRows( + int rows ) + { + SMC_MOCK_METHOD1( void, int, rows ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::maxRows +// ----------------------------------------------------------------------------- +// +int HbLineEdit::maxRows( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::isExpandable +// ----------------------------------------------------------------------------- +// +bool HbLineEdit::isExpandable( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::text +// ----------------------------------------------------------------------------- +// +QString HbLineEdit::text( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::displayText +// ----------------------------------------------------------------------------- +// +QString HbLineEdit::displayText( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::hasSelectedText +// ----------------------------------------------------------------------------- +// +bool HbLineEdit::hasSelectedText( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::selectedText +// ----------------------------------------------------------------------------- +// +QString HbLineEdit::selectedText( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::selectionStart +// ----------------------------------------------------------------------------- +// +int HbLineEdit::selectionStart( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setSelection +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setSelection( + int start, + int length ) + { + SMC_MOCK_METHOD2( void, int, start, + int, length ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setCursorPosition +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setCursorPosition( + int pos ) + { + SMC_MOCK_METHOD1( void, int, pos ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::echoMode +// ----------------------------------------------------------------------------- +// +HbLineEdit::EchoMode HbLineEdit::echoMode( ) const + { + SMC_MOCK_METHOD0( HbLineEdit::EchoMode ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setEchoMode +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setEchoMode( HbLineEdit::EchoMode mode ) + { + SMC_MOCK_METHOD1( void, HbLineEdit::EchoMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setCapitalization +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setCapitalization( + QFont::Capitalization caps ) + { + SMC_MOCK_METHOD1( void, QFont::Capitalization, caps ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::capitalization +// ----------------------------------------------------------------------------- +// +QFont::Capitalization HbLineEdit::capitalization( ) const + { + SMC_MOCK_METHOD0( QFont::Capitalization ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::adjustFontSizeToFitHeight +// ----------------------------------------------------------------------------- +// +bool HbLineEdit::adjustFontSizeToFitHeight( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setAdjustFontSizeToFitHeight +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setAdjustFontSizeToFitHeight( + bool active ) + { + SMC_MOCK_METHOD1( void, bool, active ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::event +// ----------------------------------------------------------------------------- +// +bool HbLineEdit::event( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setAutoCompleteContent +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setAutoCompleteContent( + QGraphicsLayoutItem * content ) + { + SMC_MOCK_METHOD1( void, QGraphicsLayoutItem *, content ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::setText +// ----------------------------------------------------------------------------- +// +void HbLineEdit::setText( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::editingFinished +// ----------------------------------------------------------------------------- +// +void HbLineEdit::editingFinished( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::textChanged +// ----------------------------------------------------------------------------- +// +void HbLineEdit::textChanged( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::selectionChanged +// ----------------------------------------------------------------------------- +// +void HbLineEdit::selectionChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::HbLineEdit +// ----------------------------------------------------------------------------- +// +HbLineEdit::HbLineEdit( + HbLineEditPrivate & dd, + QGraphicsItem * parent ) : + HbAbstractEdit(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::inputMethodEvent +// ----------------------------------------------------------------------------- +// +void HbLineEdit::inputMethodEvent( + QInputMethodEvent * event ) + { + SMC_MOCK_METHOD1( void, QInputMethodEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::inputMethodQuery +// ----------------------------------------------------------------------------- +// +QVariant HbLineEdit::inputMethodQuery( + Qt::InputMethodQuery q ) const + { + SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, q ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::keyPressEvent +// ----------------------------------------------------------------------------- +// +void HbLineEdit::keyPressEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::keyReleaseEvent +// ----------------------------------------------------------------------------- +// +void HbLineEdit::keyReleaseEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::canInsertFromMimeData +// ----------------------------------------------------------------------------- +// +bool HbLineEdit::canInsertFromMimeData( + const QMimeData * source ) const + { + SMC_MOCK_METHOD1( bool, const QMimeData *, source ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::insertFromMimeData +// ----------------------------------------------------------------------------- +// +void HbLineEdit::insertFromMimeData( + const QMimeData * source ) + { + SMC_MOCK_METHOD1( void, const QMimeData *, source ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::focusOutEvent +// ----------------------------------------------------------------------------- +// +void HbLineEdit::focusOutEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::focusInEvent +// ----------------------------------------------------------------------------- +// +void HbLineEdit::focusInEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbLineEdit::eventFilter +// ----------------------------------------------------------------------------- +// +bool HbLineEdit::eventFilter( + QObject * o, + QEvent * e) + { + SMC_MOCK_METHOD2( bool, QObject*, o, + QEvent*, e ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbmainwindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbmainwindow.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,479 @@ +/** 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 +#include +#include +#include +#include "hbmainwindow.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbMainWindow::HbMainWindow +// ----------------------------------------------------------------------------- +// +HbMainWindow::HbMainWindow( + QWidget * parent, + Hb::WindowFlags windowFlags ) : QGraphicsView(parent), d_ptr(0) + { + + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::~HbMainWindow +// ----------------------------------------------------------------------------- +// +HbMainWindow::~HbMainWindow( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::addView +// ----------------------------------------------------------------------------- +// +HbView * HbMainWindow::addView( + QGraphicsWidget * widget ) + { + SMC_MOCK_METHOD1( HbView *, QGraphicsWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::insertView +// ----------------------------------------------------------------------------- +// +HbView * HbMainWindow::insertView( + int index, + QGraphicsWidget * widget ) + { + SMC_MOCK_METHOD2( HbView *, int, index, + QGraphicsWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::removeView +// ----------------------------------------------------------------------------- +// +void HbMainWindow::removeView( + QGraphicsWidget * widget ) + { + SMC_MOCK_METHOD1( void, QGraphicsWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::views +// ----------------------------------------------------------------------------- +// +QList HbMainWindow::views( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::currentView +// ----------------------------------------------------------------------------- +// +HbView * HbMainWindow::currentView( ) const + { + SMC_MOCK_METHOD0( HbView * ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::setCurrentView +// ----------------------------------------------------------------------------- +// +void HbMainWindow::setCurrentView( + HbView * view, + bool animate, + Hb::ViewSwitchFlags flags ) + { + SMC_MOCK_METHOD3( void, HbView *, view, + bool, animate, + /*Hb::ViewSwitchFlags*/int, flags ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::orientation +// ----------------------------------------------------------------------------- +// +Qt::Orientation HbMainWindow::orientation( ) const + { + SMC_MOCK_METHOD0( Qt::Orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::setOrientation +// ----------------------------------------------------------------------------- +// +void HbMainWindow::setOrientation( + Qt::Orientation orientation, + bool animate ) + { + SMC_MOCK_METHOD2( void, Qt::Orientation, orientation, + bool, animate ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::unsetOrientation +// ----------------------------------------------------------------------------- +// +void HbMainWindow::unsetOrientation( + bool animate ) + { + SMC_MOCK_METHOD1( void, bool, animate ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::nativeBackgroundWindow +// ----------------------------------------------------------------------------- +// +WId HbMainWindow::nativeBackgroundWindow( ) + { + SMC_MOCK_METHOD0( WId ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::resetNativeBackgroundWindow +// ----------------------------------------------------------------------------- +// +void HbMainWindow::resetNativeBackgroundWindow( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::layoutRect +// ----------------------------------------------------------------------------- +// +QRectF HbMainWindow::layoutRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::setBackgroundImageName +// ----------------------------------------------------------------------------- +// +void HbMainWindow::setBackgroundImageName( + Qt::Orientation orientation, + const QString & name ) + { + SMC_MOCK_METHOD2( void, Qt::Orientation, orientation, + const QString &, name ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::backgroundImageName +// ----------------------------------------------------------------------------- +// +QString HbMainWindow::backgroundImageName( + Qt::Orientation orientation ) const + { + SMC_MOCK_METHOD1( QString, Qt::Orientation, orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::setBackgroundImageMode +// ----------------------------------------------------------------------------- +// +void HbMainWindow::setBackgroundImageMode( + Hb::BackgroundImageMode mode ) + { + SMC_MOCK_METHOD1( void, Hb::BackgroundImageMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::backgroundImageMode +// ----------------------------------------------------------------------------- +// +Hb::BackgroundImageMode HbMainWindow::backgroundImageMode( ) const + { + SMC_MOCK_METHOD0( Hb::BackgroundImageMode ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::setAutomaticOrientationEffectEnabled +// ----------------------------------------------------------------------------- +// +void HbMainWindow::setAutomaticOrientationEffectEnabled( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::automaticOrientationEffectEnabled +// ----------------------------------------------------------------------------- +// +bool HbMainWindow::automaticOrientationEffectEnabled( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::isObscured +// ----------------------------------------------------------------------------- +// +bool HbMainWindow::isObscured( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::broadcastEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::broadcastEvent( + int eventType ) + { + SMC_MOCK_METHOD1( void, int, eventType ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::viewReady +// ----------------------------------------------------------------------------- +// +void HbMainWindow::viewReady( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::aboutToChangeView +// ----------------------------------------------------------------------------- +// +void HbMainWindow::aboutToChangeView( + HbView * oldView, + HbView * newView ) + { + SMC_MOCK_METHOD2( void, HbView *, oldView, + HbView *, newView ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::currentViewChanged +// ----------------------------------------------------------------------------- +// +void HbMainWindow::currentViewChanged( + HbView * view ) + { + SMC_MOCK_METHOD1( void, HbView *, view ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::aboutToChangeOrientation +// ----------------------------------------------------------------------------- +// +void HbMainWindow::aboutToChangeOrientation( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::aboutToChangeOrientation +// ----------------------------------------------------------------------------- +// +void HbMainWindow::aboutToChangeOrientation( + Qt::Orientation newOrientation, + bool animated ) + { + SMC_MOCK_METHOD2( void, Qt::Orientation, newOrientation, + bool, animated ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::orientationChanged +// ----------------------------------------------------------------------------- +// +void HbMainWindow::orientationChanged( + Qt::Orientation orientation ) + { + SMC_MOCK_METHOD1( void, Qt::Orientation, orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::obscured +// ----------------------------------------------------------------------------- +// +void HbMainWindow::obscured( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::revealed +// ----------------------------------------------------------------------------- +// +void HbMainWindow::revealed( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::changeEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::closeEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::closeEvent( + QCloseEvent * event ) + { + SMC_MOCK_METHOD1( void, QCloseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::drawBackground +// ----------------------------------------------------------------------------- +// +void HbMainWindow::drawBackground( + QPainter * painter, + const QRectF & rect ) + { + SMC_MOCK_METHOD2( void, QPainter *, painter, + const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::keyPressEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::keyPressEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::keyReleaseEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::keyReleaseEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::resizeEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::resizeEvent( + QResizeEvent * event ) + { + SMC_MOCK_METHOD1( void, QResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::customEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::customEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::scrollContentsBy +// ----------------------------------------------------------------------------- +// +void HbMainWindow::scrollContentsBy( + int dx, + int dy ) + { + SMC_MOCK_METHOD2( void, int, dx, + int, dy ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::paintEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::paintEvent( + QPaintEvent * event ) + { + SMC_MOCK_METHOD1( void, QPaintEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::showEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::showEvent( + QShowEvent * event ) + { + SMC_MOCK_METHOD1( void, QShowEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::event +// ----------------------------------------------------------------------------- +// +bool HbMainWindow::event( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbpopup.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbpopup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,332 @@ +/* +* 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 +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbPopup::HbPopup +// ----------------------------------------------------------------------------- +// +HbPopup::HbPopup( + QGraphicsItem * parent ) + : HbWidget( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbPopup::Q_ENUMS +// ----------------------------------------------------------------------------- +// +/* +void HbPopup::Q_ENUMS( + DefaultTimeout DismissPolicy FrameType ) Q_PROPERTY ( int timeout READ timeout WRITE setTimeout ) Q_PROPERTY ( bool modal READ isModal WRITE setModal ) Q_PROPERTY ( bool backgroundFaded READ isBackgroundFaded WRITE setBackgroundFaded ) Q_PROPERTY ( DismissPolicy dismissPolicy READ dismissPolicy WRITE setDismissPolicy ) Q_PROPERTY ( FrameType frameType READ frameType WRITE setFrameType ) + { + SMC_MOCK_METHOD1( void, DefaultTimeout DismissPolicy FrameType ) Q_PROPERTY ( int timeout READ timeout WRITE setTimeout ) Q_PROPERTY ( bool modal READ isModal WRITE setModal ) Q_PROPERTY ( bool backgroundFaded READ isBackgroundFaded WRITE setBackgroundFaded ) Q_PROPERTY ( DismissPolicy dismissPolicy READ dismissPolicy WRITE setDismissPolicy ) Q_PROPERTY ( FrameType frameType READ frameType WRITE, setFrameType ) + } +*/ + +// ----------------------------------------------------------------------------- +// HbPopup::~HbPopup +// ----------------------------------------------------------------------------- +// +HbPopup::~HbPopup( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbPopup::timeout +// ----------------------------------------------------------------------------- +// +int HbPopup::timeout( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::setTimeout +// ----------------------------------------------------------------------------- +// +void HbPopup::setTimeout( + int timeout ) + { + SMC_MOCK_METHOD1( void, int, timeout ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::setTimeout +// ----------------------------------------------------------------------------- +// +void HbPopup::setTimeout( + HbPopup::DefaultTimeout timeout ) + { + SMC_MOCK_METHOD1( void, HbPopup::DefaultTimeout, timeout ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::isModal +// ----------------------------------------------------------------------------- +// +bool HbPopup::isModal( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::setModal +// ----------------------------------------------------------------------------- +// +void HbPopup::setModal( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::setBackgroundFaded +// ----------------------------------------------------------------------------- +// +void HbPopup::setBackgroundFaded( + bool fadeBackground ) + { + SMC_MOCK_METHOD1( void, bool, fadeBackground ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::isBackgroundFaded +// ----------------------------------------------------------------------------- +// +bool HbPopup::isBackgroundFaded( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::dismissPolicy +// ----------------------------------------------------------------------------- +// +HbPopup::DismissPolicy HbPopup::dismissPolicy( ) const + { + SMC_MOCK_METHOD0( DismissPolicy ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::setDismissPolicy +// ----------------------------------------------------------------------------- +// +void HbPopup::setDismissPolicy( + HbPopup::DismissPolicy dismissPolicy ) + { + SMC_MOCK_METHOD1( void, HbPopup::DismissPolicy, dismissPolicy ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::frameType +// ----------------------------------------------------------------------------- +// +HbPopup::FrameType HbPopup::frameType( ) const + { + SMC_MOCK_METHOD0( FrameType ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::setFrameType +// ----------------------------------------------------------------------------- +// +void HbPopup::setFrameType( + HbPopup::FrameType frameType ) + { + SMC_MOCK_METHOD1( void, HbPopup::FrameType, frameType ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::type +// ----------------------------------------------------------------------------- +// +/* +int HbPopup::type( ) const + { + SMC_MOCK_METHOD0( int ) + } +*/ + +// ----------------------------------------------------------------------------- +// HbPopup::setPreferredPos +// ----------------------------------------------------------------------------- +// +void HbPopup::setPreferredPos( + const QPointF & position, + HbPopup::Placement placement ) + { + //SMC_MOCK_METHOD2( void, const QPointF &, position, + // HbPopup::Placement, placement ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::aboutToShow +// ----------------------------------------------------------------------------- +// +void HbPopup::aboutToShow( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::aboutToHide +// ----------------------------------------------------------------------------- +// +void HbPopup::aboutToHide( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::aboutToClose +// ----------------------------------------------------------------------------- +// +void HbPopup::aboutToClose( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::HbPopup +// ----------------------------------------------------------------------------- +// +HbPopup::HbPopup( + HbPopupPrivate & dd, + QGraphicsItem * parent ) + //: + //HbWidget( /*dd, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbPopup::itemChange +// ----------------------------------------------------------------------------- +// +QVariant HbPopup::itemChange( + GraphicsItemChange change, + const QVariant & value ) + { + // SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, + // const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::mousePressEvent +// ----------------------------------------------------------------------------- +// +void HbPopup::mousePressEvent( + QGraphicsSceneMouseEvent * event ) + { + // SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::mouseReleaseEvent +// ----------------------------------------------------------------------------- +// +void HbPopup::mouseReleaseEvent( + QGraphicsSceneMouseEvent * event ) + { + // SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + + + +// ----------------------------------------------------------------------------- +// HbPopup::showEvent +// ----------------------------------------------------------------------------- +// +void HbPopup::showEvent( + QShowEvent * event ) + { + //SMC_MOCK_METHOD1( void, QShowEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::hideEvent +// ----------------------------------------------------------------------------- +// +void HbPopup::hideEvent( + QHideEvent * event ) + { + //SMC_MOCK_METHOD1( void, QHideEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::resizeEvent +// ----------------------------------------------------------------------------- +// +void HbPopup::resizeEvent( + QGraphicsSceneResizeEvent * event ) + { + // SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::closeEvent +// ----------------------------------------------------------------------------- +// +void HbPopup::closeEvent( + QCloseEvent * event ) + { + // SMC_MOCK_METHOD1( void, QCloseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbPopup::event +// ----------------------------------------------------------------------------- +// +bool HbPopup::event( + QEvent * event ) + { + // SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbsliderpopup.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbsliderpopup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,710 @@ +/** 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 +#include +#include "hbsliderpopup.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbSliderPopup::HbSliderPopup +// ----------------------------------------------------------------------------- +// +HbSliderPopup::HbSliderPopup( + QGraphicsItem * parent ) + : HbDialog( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::HbSliderPopup +// ----------------------------------------------------------------------------- +// +HbSliderPopup::HbSliderPopup( + Qt::Orientation orientation, + QGraphicsItem * parent ) + //: + //HbDialog( /*orientation, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::~HbSliderPopup +// ----------------------------------------------------------------------------- +// +HbSliderPopup::~HbSliderPopup( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::invertedAppearance +// ----------------------------------------------------------------------------- +// +bool HbSliderPopup::invertedAppearance( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setInvertedAppearance +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setInvertedAppearance( + bool inverted ) + { + SMC_MOCK_METHOD1( void, bool, inverted ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::maximum +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::maximum( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setMaximum +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setMaximum( + int max ) + { + SMC_MOCK_METHOD1( void, int, max ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::minimum +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::minimum( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setMinimum +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setMinimum( + int min ) + { + SMC_MOCK_METHOD1( void, int, min ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setRange +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setRange( + int min, + int max ) + { + SMC_MOCK_METHOD2( void, int, min, + int, max ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::orientation +// ----------------------------------------------------------------------------- +// +Qt::Orientation HbSliderPopup::orientation( ) const + { + SMC_MOCK_METHOD0( Qt::Orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::pageStep +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::pageStep( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setPageStep +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setPageStep( + int step ) + { + SMC_MOCK_METHOD1( void, int, step ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::singleStep +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::singleStep( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setSingleStep +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setSingleStep( + int step ) + { + SMC_MOCK_METHOD1( void, int, step ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::sliderPosition +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::sliderPosition( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setSliderPosition +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setSliderPosition( + int pos ) + { + SMC_MOCK_METHOD1( void, int, pos ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::hasTracking +// ----------------------------------------------------------------------------- +// +bool HbSliderPopup::hasTracking( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setTracking +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setTracking( + bool enable ) + { + SMC_MOCK_METHOD1( void, bool, enable ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::tickPosition +// ----------------------------------------------------------------------------- +// +Hb::SliderTickPositions HbSliderPopup::tickPosition( ) const + { + SMC_MOCK_METHOD0( Hb::SliderTickPositions ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setTickPosition +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setTickPosition( + Hb::SliderTickPositions position ) + { + SMC_MOCK_METHOD1( void, /*Hb::SliderTickPositions*/int, position ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::snappingMode +// ----------------------------------------------------------------------------- +// +HbSlider::SnappingMode HbSliderPopup::snappingMode( ) const + { + SMC_MOCK_METHOD0( HbSlider::SnappingMode ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setSnappingMode +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setSnappingMode( + HbSlider::SnappingMode mode ) + { + SMC_MOCK_METHOD1( void, HbSlider::SnappingMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::icon +// ----------------------------------------------------------------------------- +// +HbIcon HbSliderPopup::icon( + HbSlider::SliderElement element ) const + { + SMC_MOCK_METHOD1( HbIcon, HbSlider::SliderElement, element ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setIcon +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setIcon( + HbSlider::SliderElement element, + const HbIcon & icon ) + { + SMC_MOCK_METHOD2( void, HbSlider::SliderElement, element, + const HbIcon &, icon ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setElementIcon +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setElementIcon( + HbSlider::SliderElement element, + const HbIcon & icon ) + { + SMC_MOCK_METHOD2( void, HbSlider::SliderElement, element, + const HbIcon &, icon ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::elementIcon +// ----------------------------------------------------------------------------- +// +HbIcon HbSliderPopup::elementIcon( + HbSlider::SliderElement element ) const + { + SMC_MOCK_METHOD1( HbIcon, HbSlider::SliderElement, element ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::elements +// ----------------------------------------------------------------------------- +// +QList HbSliderPopup::elements( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setElements +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setElements( + const QList & elements ) + { + SMC_MOCK_METHOD1( void, const QList &, elements ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::elementIcons +// ----------------------------------------------------------------------------- +// +typedef QMap qmapDefine; +QMap HbSliderPopup::elementIcons( ) const + { + SMC_MOCK_METHOD0( qmapDefine ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setElementIcons +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setElementIcons( + const QMap &elements ) + { + SMC_MOCK_METHOD1( void, const qmapDefine, elements ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setSliderElements +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setSliderElements( + const QList & elements ) + { + SMC_MOCK_METHOD1( void, const QList &, elements ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::sliderElements +// ----------------------------------------------------------------------------- +// +QList HbSliderPopup::sliderElements( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::majorTickInterval +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::majorTickInterval( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setMajorTickInterval +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setMajorTickInterval( + int interval ) + { + SMC_MOCK_METHOD1( void, int, interval ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::minorTickInterval +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::minorTickInterval( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setMinorTickInterval +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setMinorTickInterval( + int interval ) + { + SMC_MOCK_METHOD1( void, int, interval ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::majorTickLabels +// ----------------------------------------------------------------------------- +// +QStringList HbSliderPopup::majorTickLabels( ) const + { + SMC_MOCK_METHOD0( QStringList ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setMajorTickLabels +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setMajorTickLabels( + const QStringList & majorTickLabels ) + { + SMC_MOCK_METHOD1( void, const QStringList &, majorTickLabels ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::minorTickLabels +// ----------------------------------------------------------------------------- +// +QStringList HbSliderPopup::minorTickLabels( ) const + { + SMC_MOCK_METHOD0( QStringList ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setMinorTickLabels +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setMinorTickLabels( + const QStringList & minorTickLabels ) + { + SMC_MOCK_METHOD1( void, const QStringList &, minorTickLabels ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::value +// ----------------------------------------------------------------------------- +// +int HbSliderPopup::value( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::text +// ----------------------------------------------------------------------------- +// +QString HbSliderPopup::text( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setToolTipAlignment +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setToolTipAlignment( + Qt::Alignment a) + { + SMC_MOCK_METHOD1( void, /*Qt::Alignment*/int, a ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::toolTipAlignment +// ----------------------------------------------------------------------------- +// +Qt::Alignment HbSliderPopup::toolTipAlignment( ) const + { + SMC_MOCK_METHOD0( Qt::Alignment ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setToolTipVisible +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setToolTipVisible( bool visible ) + { + SMC_MOCK_METHOD1( void, bool, visible ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::isToolTipVisible +// ----------------------------------------------------------------------------- +// +bool HbSliderPopup::isToolTipVisible( ) + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setTrackFilled +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setTrackFilled( + bool trackVisible ) + { + SMC_MOCK_METHOD1( void, bool, trackVisible ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::isTrackFilled +// ----------------------------------------------------------------------------- +// +bool HbSliderPopup::isTrackFilled( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::primitive +// ----------------------------------------------------------------------------- +// +QGraphicsItem * HbSliderPopup::primitive( + HbStyle::Primitive primitive ) const + { + SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setValue +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setValue( + int value ) + { + SMC_MOCK_METHOD1( void, int, value ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setText +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setText( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::setOrientation +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::setOrientation( + Qt::Orientation orientation ) + { + SMC_MOCK_METHOD1( void, Qt::Orientation, orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::updatePrimitives +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::updatePrimitives( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::valueChanged +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::valueChanged( + int value ) + { + SMC_MOCK_METHOD1( void, int, value ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::sliderPressed +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::sliderPressed( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::sliderReleased +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::sliderReleased( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::sliderMoved +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::sliderMoved( + int value ) + { + SMC_MOCK_METHOD1( void, int, value ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::rangeChanged +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::rangeChanged( + int min, + int max ) + { + SMC_MOCK_METHOD2( void, int, min, + int, max ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::iconPressed +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::iconPressed( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::iconReleased +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::iconReleased( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::iconClicked +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::iconClicked( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::textClicked +// ----------------------------------------------------------------------------- +// +void HbSliderPopup::textClicked( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbSliderPopup::HbSliderPopup +// ----------------------------------------------------------------------------- +// +HbSliderPopup::HbSliderPopup( + HbSliderPopupPrivate & dd, + QGraphicsItem * parent ) + //: + //HbDialog( /*dd, parent*/ ) + { + + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbstyle.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbstyle.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,181 @@ +/* +* 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 +#include +#include "hbstyle.h" +#include + +//needed for TSmcValueSize()const +class HbStyleParameters {}; +//needed for TSmcValueSize()const +class HbWidget {}; + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbStyle::HbStyle +// ----------------------------------------------------------------------------- +// +HbStyle::HbStyle( ):d_ptr(NULL) + // QObject * parent ) + { + // Q_UNUSED(parent); + } + + +// ----------------------------------------------------------------------------- +// HbStyle::~HbStyle +// ----------------------------------------------------------------------------- +// +HbStyle::~HbStyle( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbStyle::createPrimitive +// ----------------------------------------------------------------------------- +// +QGraphicsObject * HbStyle::createPrimitive( + HbStyle::PrimitiveType primitiveType, + const QString &itemName, + QGraphicsObject *parent ) const + { + SMC_MOCK_METHOD3( QGraphicsObject *, HbStyle::PrimitiveType, primitiveType, + const QString &, itemName, + QGraphicsObject *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::updatePrimitive +// ----------------------------------------------------------------------------- +// +bool HbStyle::updatePrimitive( + QGraphicsObject *primitive, + const HbStylePrimitiveData *data, + QGraphicsObject *parent ) const + { + SMC_MOCK_METHOD3( bool, QGraphicsObject *, primitive, + const HbStylePrimitiveData *, data, + QGraphicsObject *, parent ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::setItemName +// ----------------------------------------------------------------------------- +// +void HbStyle::setItemName( + QGraphicsItem * item, + const QString & name ) + { + SMC_MOCK_METHOD2( void, QGraphicsItem *, item, + const QString &, name ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::itemName +// ----------------------------------------------------------------------------- +// +QString HbStyle::itemName( + const QGraphicsItem * item ) + { + SMC_MOCK_METHOD1( QString, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::parameter +// ----------------------------------------------------------------------------- +// +bool HbStyle::parameter( + const QString & parameter, + qreal & value, + const HbDeviceProfile & profile ) const + { + SMC_MOCK_METHOD3( bool, const QString &, parameter, + qreal &, value, + const HbDeviceProfile &, profile ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::parameters +// ----------------------------------------------------------------------------- +// +void HbStyle::parameters( + HbStyleParameters & parameters, + const HbDeviceProfile & profile ) const + { + SMC_MOCK_METHOD2( void, HbStyleParameters &, parameters, + const HbDeviceProfile &, profile ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::polish +// ----------------------------------------------------------------------------- +// +void HbStyle::polish( + HbWidget * widget, + HbStyleParameters & params ) + { + SMC_MOCK_METHOD2( void, HbWidget *, widget, + HbStyleParameters &, params ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::updateThemedParams +// ----------------------------------------------------------------------------- +// +void HbStyle::updateThemedParams( + HbWidget * widget ) + { + SMC_MOCK_METHOD1( void, HbWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::hasOrientationSpecificStyleRules +// ----------------------------------------------------------------------------- +// +bool HbStyle::hasOrientationSpecificStyleRules( + HbWidget * widget ) + { + SMC_MOCK_METHOD1( bool, HbWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbStyle::HbStyle +// ----------------------------------------------------------------------------- +// +HbStyle::HbStyle( + HbStylePrivate & dd, + QStyle * parent ):d_ptr(NULL) + //: + //QObject( /*dd, parent*/ ) + { + Q_UNUSED(dd); + Q_UNUSED(parent); + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbstyleloader.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbstyleloader.cpp Fri Oct 15 12:58:46 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 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 +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbStyleLoader::registerFilePath +// ----------------------------------------------------------------------------- +// +bool HbStyleLoader::registerFilePath( + const QString & filePath ) + { + SMC_MOCK_METHOD1( bool, const QString &, filePath ) + } + + +// ----------------------------------------------------------------------------- +// HbStyleLoader::unregisterFilePath +// ----------------------------------------------------------------------------- +// +bool HbStyleLoader::unregisterFilePath( + const QString & filePath ) + { + SMC_MOCK_METHOD1( bool, const QString &, filePath ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbtapgesture.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbtapgesture.cpp Fri Oct 15 12:58:46 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 +#include + +#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*/ ) + { + + } + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbtextitem.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbtextitem.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,408 @@ +/** 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 +#include +#include "hbtextitem.h" + +/*#include +#include */ + +#include +#include +#include +#include +#include + + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbTextItem::HbTextItem +// ----------------------------------------------------------------------------- +// +HbTextItem::HbTextItem( + QGraphicsItem * parent ) + //: + //HbWidgetBase( /*parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::HbTextItem +// ----------------------------------------------------------------------------- +// +HbTextItem::HbTextItem( + const QString & text, + QGraphicsItem * parent ) + //: + //HbWidgetBase( /*text, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::~HbTextItem +// ----------------------------------------------------------------------------- +// +HbTextItem::~HbTextItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setText +// ----------------------------------------------------------------------------- +// +void HbTextItem::setText( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::text +// ----------------------------------------------------------------------------- +// +QString HbTextItem::text( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setTextColor +// ----------------------------------------------------------------------------- +// +void HbTextItem::setTextColor( + const QColor & color ) + { + SMC_MOCK_METHOD1( void, const QColor &, color ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::textColor +// ----------------------------------------------------------------------------- +// +QColor HbTextItem::textColor( ) const + { + SMC_MOCK_METHOD0( QColor ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setAlignment +// ----------------------------------------------------------------------------- +// +void HbTextItem::setAlignment( + Qt::Alignment alignment ) + { + int align = alignment; + SMC_MOCK_METHOD1( void, int, align ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::alignment +// ----------------------------------------------------------------------------- +// +Qt::Alignment HbTextItem::alignment( ) const + { + //SMC_MOCK_METHOD0( Qt::Alignment ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setElideMode +// ----------------------------------------------------------------------------- +// +void HbTextItem::setElideMode( + Qt::TextElideMode elideMode ) + { + SMC_MOCK_METHOD1( void, Qt::TextElideMode, elideMode ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::elideMode +// ----------------------------------------------------------------------------- +// +Qt::TextElideMode HbTextItem::elideMode( ) const + { + SMC_MOCK_METHOD0( Qt::TextElideMode ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setTextWrapping +// ----------------------------------------------------------------------------- +// +void HbTextItem::setTextWrapping( + Hb::TextWrapping mode ) + { + SMC_MOCK_METHOD1( void, Hb::TextWrapping, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::textWrapping +// ----------------------------------------------------------------------------- +// +Hb::TextWrapping HbTextItem::textWrapping( ) const + { + SMC_MOCK_METHOD0( Hb::TextWrapping ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setTextVisible +// ----------------------------------------------------------------------------- +// +void HbTextItem::setTextVisible( + bool isVisible ) + { + SMC_MOCK_METHOD1( void, bool, isVisible ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::isTextVisible +// ----------------------------------------------------------------------------- +// +bool HbTextItem::isTextVisible( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setTextClip +// ----------------------------------------------------------------------------- +// +void HbTextItem::setTextClip( + bool cliping ) + { + SMC_MOCK_METHOD1( void, bool, cliping ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::isTextClip +// ----------------------------------------------------------------------------- +// +bool HbTextItem::isTextClip( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::type +// ----------------------------------------------------------------------------- +// +/*int HbTextItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + }*/ + + +// ----------------------------------------------------------------------------- +// HbTextItem::setGeometry +// ----------------------------------------------------------------------------- +// +void HbTextItem::setGeometry( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF HbTextItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setMinimumLines +// ----------------------------------------------------------------------------- +// +void HbTextItem::setMinimumLines( + int minLines ) + { + SMC_MOCK_METHOD1( void, int, minLines ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setMaximumLines +// ----------------------------------------------------------------------------- +// +void HbTextItem::setMaximumLines( + int maxLines ) + { + SMC_MOCK_METHOD1( void, int, maxLines ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::minimumLines +// ----------------------------------------------------------------------------- +// +int HbTextItem::minimumLines( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::maximumLines +// ----------------------------------------------------------------------------- +// +int HbTextItem::maximumLines( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::paint +// ----------------------------------------------------------------------------- +// +void HbTextItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::fadeLengths +// ----------------------------------------------------------------------------- +// +QPointF HbTextItem::fadeLengths( ) const + { + SMC_MOCK_METHOD0( QPointF ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setFadeLength +// ----------------------------------------------------------------------------- +// +void HbTextItem::setFadeLength( + qreal length ) + { + SMC_MOCK_METHOD1( void, qreal, length ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setFadeLengths +// ----------------------------------------------------------------------------- +// +void HbTextItem::setFadeLengths( + qreal xLength, + qreal yLength ) + { + SMC_MOCK_METHOD2( void, qreal, xLength, + qreal, yLength ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::setFadeLengths +// ----------------------------------------------------------------------------- +// +void HbTextItem::setFadeLengths( + const QPointF & lengths ) + { + SMC_MOCK_METHOD1( void, const QPointF &, lengths ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::sizeHint +// ----------------------------------------------------------------------------- +// +QSizeF HbTextItem::sizeHint( + Qt::SizeHint which, + const QSizeF & constraint ) const + { + SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which, + const QSizeF &, constraint ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::resizeEvent +// ----------------------------------------------------------------------------- +// +void HbTextItem::resizeEvent( + QGraphicsSceneResizeEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::changeEvent +// ----------------------------------------------------------------------------- +// +void HbTextItem::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::updateGeometry +// ----------------------------------------------------------------------------- +// +void HbTextItem::updateGeometry( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbTextItem::HbTextItem +// ----------------------------------------------------------------------------- +// +HbTextItem::HbTextItem( + HbTextItemPrivate & dd, + QGraphicsItem * parent ) + //: + //HbWidgetBase( /*dd, parent*/ ) + { + + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbtoolbar.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbtoolbar.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,249 @@ +/** 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 +#include +#include +#include +#include +#include "hbtoolbar.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbToolBar::HbToolBar +// ----------------------------------------------------------------------------- +// +HbToolBar::HbToolBar( + QGraphicsItem * parent ) + : HbWidget( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::~HbToolBar +// ----------------------------------------------------------------------------- +// +HbToolBar::~HbToolBar( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::addAction +// ----------------------------------------------------------------------------- +// +HbAction * HbToolBar::addAction( + const QString & text ) + { + SMC_MOCK_METHOD1( HbAction *, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::addAction +// ----------------------------------------------------------------------------- +// +HbAction * HbToolBar::addAction( + const HbIcon & icon, + const QString & text ) + { + SMC_MOCK_METHOD2( HbAction *, const HbIcon &, icon, + const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::addAction +// ----------------------------------------------------------------------------- +// +HbAction * HbToolBar::addAction( + const QString & text, + const QObject * receiver, + const char * member ) + { + SMC_MOCK_METHOD3( HbAction *, const QString &, text, + const QObject *, receiver, + const char *, member ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::addAction +// ----------------------------------------------------------------------------- +// +HbAction * HbToolBar::addAction( + const HbIcon & icon, + const QString & text, + const QObject * receiver, + const char * member ) + { + SMC_MOCK_METHOD4( HbAction *, const HbIcon &, icon, + const QString &, text, + const QObject *, receiver, + const char *, member ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::addExtension +// ----------------------------------------------------------------------------- +// +HbAction * HbToolBar::addExtension( + HbToolBarExtension * extension ) + { + SMC_MOCK_METHOD1( HbAction *, HbToolBarExtension *, extension ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::insertExtension +// ----------------------------------------------------------------------------- +// +HbAction * HbToolBar::insertExtension( + HbAction * before, + HbToolBarExtension * extension ) + { + SMC_MOCK_METHOD2( HbAction *, HbAction *, before, + HbToolBarExtension *, extension ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::orientation +// ----------------------------------------------------------------------------- +// +Qt::Orientation HbToolBar::orientation( ) const + { + SMC_MOCK_METHOD0( Qt::Orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::updatePrimitives +// ----------------------------------------------------------------------------- +// +void HbToolBar::updatePrimitives( ) + { + SMC_MOCK_METHOD0( void ) + } + +// ----------------------------------------------------------------------------- +// HbToolBar::setOrientation +// ----------------------------------------------------------------------------- +// +void HbToolBar::setOrientation( + Qt::Orientation orientation ) + { + SMC_MOCK_METHOD1( void, Qt::Orientation, orientation ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::HbToolBar +// ----------------------------------------------------------------------------- +// +HbToolBar::HbToolBar( + HbToolBarPrivate & dd, + QGraphicsItem * parent ) + //: + //HbWidget( /*dd, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::itemChange +// ----------------------------------------------------------------------------- +// +QVariant HbToolBar::itemChange( + GraphicsItemChange change, + const QVariant & value ) + { + SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::gestureEvent +// ----------------------------------------------------------------------------- +// +void HbToolBar::gestureEvent( + QGestureEvent * event ) + { + SMC_MOCK_METHOD1( void, QGestureEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::changeEvent +// ----------------------------------------------------------------------------- +// +void HbToolBar::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::resizeEvent +// ----------------------------------------------------------------------------- +// +void HbToolBar::resizeEvent( + QGraphicsSceneResizeEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::hideEvent +// ----------------------------------------------------------------------------- +// +void HbToolBar::hideEvent( + QHideEvent * event ) + { + SMC_MOCK_METHOD1( void, QHideEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::event +// ----------------------------------------------------------------------------- +// +bool HbToolBar::event( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbToolBar::polish +// ----------------------------------------------------------------------------- +// +void HbToolBar::polish( + HbStyleParameters & params ) + { + SMC_MOCK_METHOD1( void, HbStyleParameters &, params ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbtoucharea.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbtoucharea.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,143 @@ +/** 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 +#include +#include + +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbTouchArea::HbTouchArea +// ----------------------------------------------------------------------------- +// +HbTouchArea::HbTouchArea( + QGraphicsItem * /*parent*/ ) + //: + //HbWidgetBase( /*parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::~HbTouchArea +// ----------------------------------------------------------------------------- +// +HbTouchArea::~HbTouchArea( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::setSize +// ----------------------------------------------------------------------------- +// +void HbTouchArea::setSize( + const QSizeF & size ) + { + SMC_MOCK_METHOD1( void, const QSizeF &, size ) + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::setGeometry +// ----------------------------------------------------------------------------- +// +void HbTouchArea::setGeometry( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::updateGeometry +// ----------------------------------------------------------------------------- +// +void HbTouchArea::updateGeometry( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::paint +// ----------------------------------------------------------------------------- +// +void HbTouchArea::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::type +// ----------------------------------------------------------------------------- +// +/*int HbTouchArea::type( ) const + { + SMC_MOCK_METHOD0( int ) + }*/ + + +// ----------------------------------------------------------------------------- +// HbTouchArea::HbTouchArea +// ----------------------------------------------------------------------------- +// +HbTouchArea::HbTouchArea( + HbTouchAreaPrivate & /*dd*/, + QGraphicsItem * /*parent*/ ) + //: + //HbWidgetBase( /*dd, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::sizeHint +// ----------------------------------------------------------------------------- +// +QSizeF HbTouchArea::sizeHint( + Qt::SizeHint which, + const QSizeF & constraint ) const + { + SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which, + const QSizeF &, constraint ) + } + + +// ----------------------------------------------------------------------------- +// HbTouchArea::gestureEvent +// ----------------------------------------------------------------------------- +// +void HbTouchArea::gestureEvent( + QGestureEvent * event ) + { + SMC_MOCK_METHOD1( void, QGestureEvent *, event ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbview.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,460 @@ +/* +* 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 +#include +#include + +#include +#include +#include +#include +#include + + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbView::HbView +// ----------------------------------------------------------------------------- +// +HbView::HbView( + QGraphicsItem * parent ) + : HbWidget( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbView::~HbView +// ----------------------------------------------------------------------------- +// +HbView::~HbView( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbView::title +// ----------------------------------------------------------------------------- +// +QString HbView::title( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// HbView::icon +// ----------------------------------------------------------------------------- +// +HbIcon HbView::icon( ) const + { + SMC_MOCK_METHOD0( HbIcon ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setIcon +// ----------------------------------------------------------------------------- +// +void HbView::setIcon( + const HbIcon & icon ) + { + SMC_MOCK_METHOD1( void, const HbIcon &, icon ) + } + + +// ----------------------------------------------------------------------------- +// HbView::menu +// ----------------------------------------------------------------------------- +// +HbMenu * HbView::menu( ) const + { + SMC_MOCK_METHOD0( HbMenu * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setMenu +// ----------------------------------------------------------------------------- +// +void HbView::setMenu( + HbMenu * menu ) + { + SMC_MOCK_METHOD1( void, HbMenu *, menu ) + } + + +// ----------------------------------------------------------------------------- +// HbView::takeMenu +// ----------------------------------------------------------------------------- +// +HbMenu * HbView::takeMenu( ) + { + SMC_MOCK_METHOD0( HbMenu * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::toolBar +// ----------------------------------------------------------------------------- +// +HbToolBar * HbView::toolBar( ) const + { + SMC_MOCK_METHOD0( HbToolBar * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setToolBar +// ----------------------------------------------------------------------------- +// +void HbView::setToolBar( + HbToolBar * toolBar ) + { + SMC_MOCK_METHOD1( void, HbToolBar *, toolBar ) + } + + +// ----------------------------------------------------------------------------- +// HbView::takeToolBar +// ----------------------------------------------------------------------------- +// +HbToolBar * HbView::takeToolBar( ) + { + SMC_MOCK_METHOD0( HbToolBar * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::dockWidget +// ----------------------------------------------------------------------------- +// +HbDockWidget * HbView::dockWidget( ) const + { + SMC_MOCK_METHOD0( HbDockWidget * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setDockWidget +// ----------------------------------------------------------------------------- +// +void HbView::setDockWidget( + HbDockWidget * dockWidget ) + { + SMC_MOCK_METHOD1( void, HbDockWidget *, dockWidget ) + } + + +// ----------------------------------------------------------------------------- +// HbView::widget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * HbView::widget( ) const + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setWidget +// ----------------------------------------------------------------------------- +// +void HbView::setWidget( + QGraphicsWidget * widget ) + { + SMC_MOCK_METHOD1( void, QGraphicsWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// HbView::takeWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * HbView::takeWidget( ) + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::showItems +// ----------------------------------------------------------------------------- +// +void HbView::showItems( + Hb::SceneItems /*items*/ ) + { + //SMC_MOCK_METHOD1( void, Hb::SceneItems, items ) + } + + +// ----------------------------------------------------------------------------- +// HbView::hideItems +// ----------------------------------------------------------------------------- +// +void HbView::hideItems( + Hb::SceneItems /*items*/ ) + { + //SMC_MOCK_METHOD1( void, Hb::SceneItems, items ) + } + + +// ----------------------------------------------------------------------------- +// HbView::visibleItems +// ----------------------------------------------------------------------------- +// +Hb::SceneItems HbView::visibleItems( ) const + { + SMC_MOCK_METHOD0( Hb::SceneItems ) + } + + +// ----------------------------------------------------------------------------- +// HbView::isItemVisible +// ----------------------------------------------------------------------------- +// +bool HbView::isItemVisible( + Hb::SceneItem /*item*/ ) const + { + //SMC_MOCK_METHOD1( bool, Hb::SceneItem, item ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setItemVisible +// ----------------------------------------------------------------------------- +// +void HbView::setItemVisible( + Hb::SceneItem /*item*/, + bool /*visible*/ ) + { + /*SMC_MOCK_METHOD2( void, Hb::SceneItem, item, + bool, visible )*/ + } + + +// ----------------------------------------------------------------------------- +// HbView::isContentFullScreen +// ----------------------------------------------------------------------------- +// +bool HbView::isContentFullScreen( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbView::viewFlags +// ----------------------------------------------------------------------------- +// +HbView::HbViewFlags HbView::viewFlags( ) const + { + SMC_MOCK_METHOD0( HbView::HbViewFlags ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setTitleBarVisible +// ----------------------------------------------------------------------------- +// +void HbView::setTitleBarVisible( + bool visible ) + { + SMC_MOCK_METHOD1( void, bool, visible ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setStatusBarVisible +// ----------------------------------------------------------------------------- +// +void HbView::setStatusBarVisible( + bool visible ) + { + SMC_MOCK_METHOD1( void, bool, visible ) + } + + + +// ----------------------------------------------------------------------------- +// HbView::addAction +// ----------------------------------------------------------------------------- +// +void HbView::addAction( + HbAction * actione, + ActionContainer preferredActionContainer ) + { + SMC_MOCK_METHOD2( void, HbAction *, actione, + ActionContainer, preferredActionContainer ) + } + + +// ----------------------------------------------------------------------------- +// HbView::navigationAction +// ----------------------------------------------------------------------------- +// +HbAction * HbView::navigationAction( ) const + { + SMC_MOCK_METHOD0( HbAction * ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setNavigationAction +// ----------------------------------------------------------------------------- +// +void HbView::setNavigationAction( + HbAction * actione ) + { + SMC_MOCK_METHOD1( void, HbAction *, actione ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setTitle +// ----------------------------------------------------------------------------- +// +void HbView::setTitle( + const QString & title ) + { + SMC_MOCK_METHOD1( void, const QString &, title ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setContentFullScreen +// ----------------------------------------------------------------------------- +// +void HbView::setContentFullScreen( + bool enable ) + { + SMC_MOCK_METHOD1( void, bool, enable ) + } + + +// ----------------------------------------------------------------------------- +// HbView::setViewFlags +// ----------------------------------------------------------------------------- +// +void HbView::setViewFlags( + HbViewFlags /*flags*/ ) + { + //SMC_MOCK_METHOD1( void, HbViewFlags, flags ) + } + + +// ----------------------------------------------------------------------------- +// HbView::titleChanged +// ----------------------------------------------------------------------------- +// +void HbView::titleChanged( + const QString & title ) + { + SMC_MOCK_METHOD1( void, const QString &, title ) + } + + +// ----------------------------------------------------------------------------- +// HbView::iconChanged +// ----------------------------------------------------------------------------- +// +void HbView::iconChanged( + const HbIcon & icon ) + { + SMC_MOCK_METHOD1( void, const HbIcon &, icon ) + } + + +// ----------------------------------------------------------------------------- +// HbView::toolBarChanged +// ----------------------------------------------------------------------------- +// +void HbView::toolBarChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbView::visibleItemsChanged +// ----------------------------------------------------------------------------- +// +void HbView::visibleItemsChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbView::contentFullScreenChanged +// ----------------------------------------------------------------------------- +// +void HbView::contentFullScreenChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbView::dockWidgetChanged +// ----------------------------------------------------------------------------- +// +void HbView::dockWidgetChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbView::HbView +// ----------------------------------------------------------------------------- +// +HbView::HbView( + HbViewPrivate & dd, + QGraphicsItem * parent ) + //: + //HbWidget( /*dd, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbView::event +// ----------------------------------------------------------------------------- +// +bool HbView::event( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbView::changeEvent +// ----------------------------------------------------------------------------- +// +void HbView::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbvolumesliderpopup.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbvolumesliderpopup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,109 @@ +/** 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 +#include +#include "hbvolumesliderpopup.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::HbVolumeSliderPopup +// ----------------------------------------------------------------------------- +// +HbVolumeSliderPopup::HbVolumeSliderPopup( ) + : HbSliderPopup() + { + + } + + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::~HbVolumeSliderPopup +// ----------------------------------------------------------------------------- +// +HbVolumeSliderPopup::~HbVolumeSliderPopup( ) + { + + } + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::setCurrentValueVisible +// ----------------------------------------------------------------------------- +// +void HbVolumeSliderPopup::setCurrentValueVisible( + bool visible ) + { + SMC_MOCK_METHOD1( void, bool, visible ) + } + + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::isCurrentValueVisible +// ----------------------------------------------------------------------------- +// +bool HbVolumeSliderPopup::isCurrentValueVisible( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::iconToggled +// ----------------------------------------------------------------------------- +// +void HbVolumeSliderPopup::iconToggled( + bool checked ) + { + SMC_MOCK_METHOD1( void, bool, checked ) + } + + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::HbVolumeSliderPopup +// ----------------------------------------------------------------------------- +// +HbVolumeSliderPopup::HbVolumeSliderPopup( + HbVolumeSliderPopupPrivate & dd, + QGraphicsItem * parent ) + //: + //HbSliderPopup( /*dd, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::keyPressEvent +// ----------------------------------------------------------------------------- +// +void HbVolumeSliderPopup::keyPressEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbVolumeSliderPopup::keyReleaseEvent +// ----------------------------------------------------------------------------- +// +void HbVolumeSliderPopup::keyReleaseEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbwidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbwidget.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,452 @@ +/** 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 +#include +#include +#include "hbwidget.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbWidget::HbWidget +// ----------------------------------------------------------------------------- +// +HbWidget::HbWidget( + QGraphicsItem * parent, + Qt::WindowFlags wFlags ) + : HbWidgetBase( parent, wFlags ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbWidget::~HbWidget +// ----------------------------------------------------------------------------- +// +HbWidget::~HbWidget( ) + { + + } + + +// ----------------------------------------------------------------------------- +// HbWidget::event +// ----------------------------------------------------------------------------- +// +bool HbWidget::event( + QEvent * e ) + { + SMC_MOCK_METHOD1( bool, QEvent *, e ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setStyle +// ----------------------------------------------------------------------------- +// +void HbWidget::setStyle( + HbStyle * style ) + { + SMC_MOCK_METHOD1( void, HbStyle *, style ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::style +// ----------------------------------------------------------------------------- +// +HbStyle * HbWidget::style( ) const + { + SMC_MOCK_METHOD0( HbStyle * ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::clearActions +// ----------------------------------------------------------------------------- +// +void HbWidget::clearActions( ) + { + SMC_MOCK_METHOD0( void ) + } + +// ----------------------------------------------------------------------------- +// HbWidget::mainWindow +// ----------------------------------------------------------------------------- +// +HbMainWindow * HbWidget::mainWindow( ) const + { + SMC_MOCK_METHOD0( HbMainWindow * ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::primitive +// ----------------------------------------------------------------------------- +// +QGraphicsItem * HbWidget::primitive( + HbStyle::Primitive primitive ) const + { + SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::primitive +// ----------------------------------------------------------------------------- +// +QGraphicsItem * HbWidget::primitive( + const QString & itemName ) const + { + SMC_MOCK_METHOD1( QGraphicsItem *, const QString &, itemName ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::layoutPrimitive +// ----------------------------------------------------------------------------- +// +QGraphicsLayoutItem * HbWidget::layoutPrimitive( + const QString & itemName ) const + { + SMC_MOCK_METHOD1( QGraphicsLayoutItem *, const QString &, itemName ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setFocusOrientation +// ----------------------------------------------------------------------------- +// +void HbWidget::setFocusOrientation( + Qt::Orientations , + Qt::Orientations ) + { + //SMC_MOCK_METHOD2( void, Qt::Orientations, previous, + // Qt::Orientations, next ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::keyForFocusNextChild +// ----------------------------------------------------------------------------- +// +QKeySequence HbWidget::keyForFocusNextChild( ) const + { + SMC_MOCK_METHOD0( QKeySequence ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::keyForFocusPreviousChild +// ----------------------------------------------------------------------------- +// +QKeySequence HbWidget::keyForFocusPreviousChild( ) const + { + SMC_MOCK_METHOD0( QKeySequence ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setKeyFocusMode +// ----------------------------------------------------------------------------- +// +void HbWidget::setKeyFocusMode( + const QKeySequence & key ) + { + SMC_MOCK_METHOD1( void, const QKeySequence &, key ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::keyFocusMode +// ----------------------------------------------------------------------------- +// +QKeySequence HbWidget::keyFocusMode( ) const + { + SMC_MOCK_METHOD0( QKeySequence ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::lastFocusedChild +// ----------------------------------------------------------------------------- +// +QGraphicsItem * HbWidget::lastFocusedChild( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setFocusOrder +// ----------------------------------------------------------------------------- +// +void HbWidget::setFocusOrder( + QGraphicsItem * first, + QGraphicsItem * second ) + { + SMC_MOCK_METHOD2( void, QGraphicsItem *, first, + QGraphicsItem *, second ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setFocusDelegation +// ----------------------------------------------------------------------------- +// +void HbWidget::setFocusDelegation( + HbWidget::FocusDelegation focusDelegation ) + { + SMC_MOCK_METHOD1( void, HbWidget::FocusDelegation, focusDelegation ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::focusDelegation +// ----------------------------------------------------------------------------- +// +HbWidget::FocusDelegation HbWidget::focusDelegation( ) const + { + SMC_MOCK_METHOD0( HbWidget::FocusDelegation ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setFocusLooping +// ----------------------------------------------------------------------------- +// +void HbWidget::setFocusLooping( + bool enable ) + { + SMC_MOCK_METHOD1( void, bool, enable ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::hasFocusLooping +// ----------------------------------------------------------------------------- +// +bool HbWidget::hasFocusLooping( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setFocusMode +// ----------------------------------------------------------------------------- +// +void HbWidget::setFocusMode( + HbWidget::FocusMode mode) + { + SMC_MOCK_METHOD1( void, HbWidget::FocusMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::focusMode +// ----------------------------------------------------------------------------- +// +HbWidget::FocusMode HbWidget::focusMode( ) const + { + SMC_MOCK_METHOD0( HbWidget::FocusMode ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setFocusHighlight +// ----------------------------------------------------------------------------- +// +void HbWidget::setFocusHighlight( + HbStyle::Primitive type, + HbWidget::FocusHighlight focusHighlight ) + { + SMC_MOCK_METHOD2( void, HbStyle::Primitive, type, + HbWidget::FocusHighlight, focusHighlight ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::focusHighlight +// ----------------------------------------------------------------------------- +// +HbStyle::Primitive HbWidget::focusHighlight( + HbWidget::FocusHighlight focusHighlight ) + { + SMC_MOCK_METHOD1( HbStyle::Primitive, HbWidget::FocusHighlight, focusHighlight ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::setBackgroundItem +// ----------------------------------------------------------------------------- +// +void HbWidget::setBackgroundItem( + QGraphicsItem * item, + int zValue ) + { + SMC_MOCK_METHOD2( void, QGraphicsItem *, item, + int, zValue ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::backgroundItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem * HbWidget::backgroundItem( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::recreatePrimitives +// ----------------------------------------------------------------------------- +// +void HbWidget::recreatePrimitives( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::updatePrimitives +// ----------------------------------------------------------------------------- +// +void HbWidget::updatePrimitives( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::focusInEvent +// ----------------------------------------------------------------------------- +// +void HbWidget::focusInEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::focusOutEvent +// ----------------------------------------------------------------------------- +// +void HbWidget::focusOutEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::resizeEvent +// ----------------------------------------------------------------------------- +// +void HbWidget::resizeEvent( + QGraphicsSceneResizeEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::changeEvent +// ----------------------------------------------------------------------------- +// +void HbWidget::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::itemChange +// ----------------------------------------------------------------------------- +// +QVariant HbWidget::itemChange( + GraphicsItemChange change, + const QVariant & value ) + { + SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::polishEvent +// ----------------------------------------------------------------------------- +// +void HbWidget::polishEvent( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::polish +// ----------------------------------------------------------------------------- +// +void HbWidget::polish( + HbStyleParameters & params ) + { + SMC_MOCK_METHOD1( void, HbStyleParameters &, params ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::repolish +// ----------------------------------------------------------------------------- +// +void HbWidget::repolish( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::sceneEventFilter +// ----------------------------------------------------------------------------- +// +bool HbWidget::sceneEventFilter( + QGraphicsItem * watched, + QEvent * event ) + { + SMC_MOCK_METHOD2( bool, QGraphicsItem *, watched, + QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// HbWidget::HbWidget +// ----------------------------------------------------------------------------- +// +HbWidget::HbWidget( + HbWidgetPrivate & dd, + QGraphicsItem * parent, + Qt::WindowFlags wFlags ) + //: + //HbWidgetBase( /*dd, parent, wFlags*/ ) + { + + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/orbit/mock_hbwidgetbase.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/orbit/mock_hbwidgetbase.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,220 @@ +/** 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 +#include +#include "hbwidgetbase.h" +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// HbWidgetBase::HbWidgetBase +// ----------------------------------------------------------------------------- +// +HbWidgetBase::HbWidgetBase( + QGraphicsItem * parent, + Qt::WindowFlags wFlags ) : + QGraphicsWidget( parent, wFlags ), + d_ptr(0) + { + + } + + +// ----------------------------------------------------------------------------- +// 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 ) : + QGraphicsWidget( parent/*, wFlags*/ ), + d_ptr(0) + { + + } + + +// ----------------------------------------------------------------------------- +// 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 * ) 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 ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/phonesrv/mock_dialpad.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/phonesrv/mock_dialpad.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,257 @@ +/** 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 +#include +#include "dialpad.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// Dialpad::Dialpad +// ----------------------------------------------------------------------------- +// +Dialpad::Dialpad( ) : mMainWindow(*(const HbMainWindow *)(0)) + { + + } + + +// ----------------------------------------------------------------------------- +// Dialpad::Dialpad +// ----------------------------------------------------------------------------- +// +Dialpad::Dialpad( + const HbMainWindow & mainWindow ) : mMainWindow(mainWindow) + { + + } + + +// ----------------------------------------------------------------------------- +// Dialpad::~Dialpad +// ----------------------------------------------------------------------------- +// +Dialpad::~Dialpad( ) + { + + } + + +// ----------------------------------------------------------------------------- +// Dialpad::editor +// ----------------------------------------------------------------------------- +// +HbLineEdit & Dialpad::editor( ) const + { + SMC_MOCK_METHOD0( HbLineEdit & ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::isOpen +// ----------------------------------------------------------------------------- +// +bool Dialpad::isOpen( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::isCallButtonEnabled +// ----------------------------------------------------------------------------- +// +bool Dialpad::isCallButtonEnabled( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::openDialpad +// ----------------------------------------------------------------------------- +// +void Dialpad::openDialpad( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::closeDialpad +// ----------------------------------------------------------------------------- +// +void Dialpad::closeDialpad( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::setCallButtonEnabled +// ----------------------------------------------------------------------------- +// +void Dialpad::setCallButtonEnabled( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::setTapOutsideDismiss +// ----------------------------------------------------------------------------- +// +void Dialpad::setTapOutsideDismiss( + bool dismiss ) + { + SMC_MOCK_METHOD1( void, bool, dismiss ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::paint +// ----------------------------------------------------------------------------- +// +void Dialpad::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::changeEvent +// ----------------------------------------------------------------------------- +// +void Dialpad::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::showEvent +// ----------------------------------------------------------------------------- +// +void Dialpad::showEvent( + QShowEvent * event ) + { + SMC_MOCK_METHOD1( void, QShowEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::hideEvent +// ----------------------------------------------------------------------------- +// +void Dialpad::hideEvent( + QHideEvent * event ) + { + SMC_MOCK_METHOD1( void, QHideEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::closeEvent +// ----------------------------------------------------------------------------- +// +void Dialpad::closeEvent( + QCloseEvent * event ) + { + SMC_MOCK_METHOD1( void, QCloseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::gestureEvent +// ----------------------------------------------------------------------------- +// +void Dialpad::gestureEvent( + QGestureEvent * event ) + { + SMC_MOCK_METHOD1( void, QGestureEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::closeAnimValueChanged +// ----------------------------------------------------------------------------- +// +void Dialpad::closeAnimValueChanged( + qreal value ) + { + SMC_MOCK_METHOD1( void, qreal, value ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::closeAnimFinished +// ----------------------------------------------------------------------------- +// +void Dialpad::closeAnimFinished( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::openAnimValueChanged +// ----------------------------------------------------------------------------- +// +void Dialpad::openAnimValueChanged( + qreal value ) + { + SMC_MOCK_METHOD1( void, qreal, value ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::openAnimFinished +// ----------------------------------------------------------------------------- +// +void Dialpad::openAnimFinished( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::orientationChangeStarted +// ----------------------------------------------------------------------------- +// +void Dialpad::orientationChangeStarted( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// Dialpad::orientationChangeFinished +// ----------------------------------------------------------------------------- +// +void Dialpad::orientationChangeFinished( + Qt::Orientation current ) + { + SMC_MOCK_METHOD1( void, Qt::Orientation, current ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/phonesrv/mock_dialpadkeyhandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/phonesrv/mock_dialpadkeyhandler.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,69 @@ +/** 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 +#include +#include "dialpadkeyhandler.h" + +// ============================ MEMBER FUNCTIONS =============================== +class DialpadVoiceMailboxEventFilter {}; +class DialpadVideoMailboxEventFilter {}; +class DialpadBluetoothEventFilter {}; +class DialpadKeySequenceEventFilter {}; +class DialpadEmergencyCallEventFilter {}; +class DialpadHashEventFilter {}; +#ifdef _DEBUG +#ifdef __WINSCW__ +class DialpadInternalEventFilter {}; +#endif +#endif +// ----------------------------------------------------------------------------- +// DialpadKeyHandler::DialpadKeyHandler +// ----------------------------------------------------------------------------- +// +DialpadKeyHandler::DialpadKeyHandler( + Dialpad * dialPad, + HbMainWindow & mainWindow, + QObject * parent ) + : QObject( parent ), mMainWindow(mainWindow) + { + + } + + +// ----------------------------------------------------------------------------- +// DialpadKeyHandler::DialpadKeyHandler +// ----------------------------------------------------------------------------- +// +DialpadKeyHandler::DialpadKeyHandler( + Dialpad * dialPad, + DialpadKeyHandler::DialpadKeyEventFilters filters, + QObject * parent ) + : QObject( parent ), mMainWindow(*(HbMainWindow *)(0)) + { + + } + + +// ----------------------------------------------------------------------------- +// DialpadKeyHandler::~DialpadKeyHandler +// ----------------------------------------------------------------------------- +// +DialpadKeyHandler::~DialpadKeyHandler( ) + { + + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/phoneuiqtviewadapter/mock_phonecallheadermanager.cpp --- a/tsrc/mocks/phoneuiqtviewadapter/mock_phonecallheadermanager.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/tsrc/mocks/phoneuiqtviewadapter/mock_phonecallheadermanager.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -15,6 +15,7 @@ */ #include #include +#include #include "phonecallheadermanager.h" // ============================ MEMBER FUNCTIONS =============================== @@ -24,11 +25,12 @@ // ----------------------------------------------------------------------------- // PhoneCallHeaderManager::PhoneCallHeaderManager( - PhoneBubbleWrapper & m_bubbleWrapper, + PhoneBubbleWrapper & bubbleWrapper, PhoneUIQtViewIF & view, - QObject * parent ) - //: - //QObject( /*m_bubbleWrapper, view, parent*/ ) + QObject * parent ) : + QObject( parent ), + m_bubbleWrapper(bubbleWrapper), + m_view(view) { } @@ -76,40 +78,6 @@ SMC_MOCK_METHOD1( void, int, callId ) } - -// ----------------------------------------------------------------------------- -// PhoneCallHeaderManager::updateCallHeaderState -// ----------------------------------------------------------------------------- -// -void PhoneCallHeaderManager::updateCallHeaderState( - int callId ) - { - SMC_MOCK_METHOD1( void, int, callId ) - } - - -// ----------------------------------------------------------------------------- -// PhoneCallHeaderManager::updateCallHeaderRemoteInfo -// ----------------------------------------------------------------------------- -// -void PhoneCallHeaderManager::updateCallHeaderRemoteInfo( - int callId ) - { - SMC_MOCK_METHOD1( void, int, callId ) - } - - -// ----------------------------------------------------------------------------- -// PhoneCallHeaderManager::updateCallHeaderRemoteInfoAndLabel -// ----------------------------------------------------------------------------- -// -void PhoneCallHeaderManager::updateCallHeaderRemoteInfoAndLabel( - int callId ) - { - SMC_MOCK_METHOD1( void, int, callId ) - } - - // ----------------------------------------------------------------------------- // PhoneCallHeaderManager::handleCipheringInfoChange // ----------------------------------------------------------------------------- @@ -184,14 +152,4 @@ } -// ----------------------------------------------------------------------------- -// PhoneCallHeaderManager::isVideoCall -// ----------------------------------------------------------------------------- -// -bool PhoneCallHeaderManager::isVideoCall( - int callId ) const - { - SMC_MOCK_METHOD1( bool, int, callId ) - } - diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/phoneuiview2/mock_phoneaction.cpp --- a/tsrc/mocks/phoneuiview2/mock_phoneaction.cpp Mon Oct 04 16:06:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +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 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 -#include -#include "phoneaction.h" - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// PhoneAction::PhoneAction -// ----------------------------------------------------------------------------- -// -PhoneAction::PhoneAction( ) - { - - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::~PhoneAction -// ----------------------------------------------------------------------------- -// -PhoneAction::~PhoneAction( ) - { - - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::setText -// ----------------------------------------------------------------------------- -// -void PhoneAction::setText( - QString text ) - { - SMC_MOCK_METHOD1( void, QString, text ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::text -// ----------------------------------------------------------------------------- -// -QString PhoneAction::text( ) const - { - SMC_MOCK_METHOD0( QString ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::setCommand -// ----------------------------------------------------------------------------- -// -void PhoneAction::setCommand( - int command ) - { - SMC_MOCK_METHOD1( void, int, command ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::command -// ----------------------------------------------------------------------------- -// -int PhoneAction::command( ) const - { - SMC_MOCK_METHOD0( int ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::icon -// ----------------------------------------------------------------------------- -// -HbIcon PhoneAction::icon( ) const - { - SMC_MOCK_METHOD0( HbIcon ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::setIcon -// ----------------------------------------------------------------------------- -// -void PhoneAction::setIcon( - HbIcon icon ) - { - SMC_MOCK_METHOD1( void, HbIcon, icon ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::setDisabled -// ----------------------------------------------------------------------------- -// -void PhoneAction::setDisabled( - bool disabled ) - { - SMC_MOCK_METHOD1( void, bool, disabled ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::isDisabled -// ----------------------------------------------------------------------------- -// -bool PhoneAction::isDisabled( ) const - { - SMC_MOCK_METHOD0( bool ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::setActionRole -// ----------------------------------------------------------------------------- -// -void PhoneAction::setActionRole( - ActionRole role ) - { - SMC_MOCK_METHOD1( void, ActionRole, role ) - } - - -// ----------------------------------------------------------------------------- -// PhoneAction::actionRole -// ----------------------------------------------------------------------------- -// -PhoneAction::ActionRole PhoneAction::actionRole( ) const - { - SMC_MOCK_METHOD0( ActionRole ) - } - - diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtgui/mock_qevent.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtgui/mock_qevent.cpp Fri Oct 15 12:58:46 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 +#include +#include + +#include +#include +#include + +// ============================ 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 & gestures ) + :QEvent(QEvent::Gesture) + //QEvent( /*gestures*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGestureEvent::~QGestureEvent +// ----------------------------------------------------------------------------- +// +QGestureEvent::~QGestureEvent( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGestureEvent::gestures +// ----------------------------------------------------------------------------- +// +QList QGestureEvent::gestures( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// QGestureEvent::gesture +// ----------------------------------------------------------------------------- +// +QGesture * QGestureEvent::gesture( + Qt::GestureType type ) const + { + SMC_MOCK_METHOD1( QGesture *, Qt::GestureType, type ) + } + + +// ----------------------------------------------------------------------------- +// QGestureEvent::activeGestures +// ----------------------------------------------------------------------------- +// +QList QGestureEvent::activeGestures( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// QGestureEvent::canceledGestures +// ----------------------------------------------------------------------------- +// +QList QGestureEvent::canceledGestures( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// 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 & 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(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 & 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( ) + { + + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtgui/mock_qgesture.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtgui/mock_qgesture.cpp Fri Oct 15 12:58:46 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 +#include +#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 ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtgui/mock_qgraphicsitem.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtgui/mock_qgraphicsitem.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,4577 @@ +/** 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 +#include +#include + +#include +#include +#include +#include +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::QGraphicsItemGroup +// ----------------------------------------------------------------------------- +// +QGraphicsItemGroup::QGraphicsItemGroup( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::~QGraphicsItemGroup +// ----------------------------------------------------------------------------- +// +QGraphicsItemGroup::~QGraphicsItemGroup( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::addToGroup +// ----------------------------------------------------------------------------- +// +void QGraphicsItemGroup::addToGroup( + QGraphicsItem * item ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::removeFromGroup +// ----------------------------------------------------------------------------- +// +void QGraphicsItemGroup::removeFromGroup( + QGraphicsItem * item ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItemGroup::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsItemGroup::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsItemGroup::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItemGroup::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItemGroup::type +// ----------------------------------------------------------------------------- +// +int QGraphicsItemGroup::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::QAbstractGraphicsShapeItem +// ----------------------------------------------------------------------------- +// +QAbstractGraphicsShapeItem::QAbstractGraphicsShapeItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::~QAbstractGraphicsShapeItem +// ----------------------------------------------------------------------------- +// +QAbstractGraphicsShapeItem::~QAbstractGraphicsShapeItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::pen +// ----------------------------------------------------------------------------- +// +QPen QAbstractGraphicsShapeItem::pen( ) const + { + SMC_MOCK_METHOD0( QPen ) + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::setPen +// ----------------------------------------------------------------------------- +// +void QAbstractGraphicsShapeItem::setPen( + const QPen & pen ) + { + SMC_MOCK_METHOD1( void, const QPen &, pen ) + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::brush +// ----------------------------------------------------------------------------- +// +QBrush QAbstractGraphicsShapeItem::brush( ) const + { + SMC_MOCK_METHOD0( QBrush ) + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::setBrush +// ----------------------------------------------------------------------------- +// +void QAbstractGraphicsShapeItem::setBrush( + const QBrush & brush ) + { + SMC_MOCK_METHOD1( void, const QBrush &, brush ) + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QAbstractGraphicsShapeItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QAbstractGraphicsShapeItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QAbstractGraphicsShapeItem::QAbstractGraphicsShapeItem +// ----------------------------------------------------------------------------- +// +QAbstractGraphicsShapeItem::QAbstractGraphicsShapeItem( + QAbstractGraphicsShapeItemPrivate & dd, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*dd, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::QGraphicsLineItem +// ----------------------------------------------------------------------------- +// +QGraphicsLineItem::QGraphicsLineItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::QGraphicsLineItem +// ----------------------------------------------------------------------------- +// +QGraphicsLineItem::QGraphicsLineItem( + const QLineF & line, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*line, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::QGraphicsLineItem +// ----------------------------------------------------------------------------- +// +QGraphicsLineItem::QGraphicsLineItem( + qreal x1, + qreal y1, + qreal x2, + qreal y2, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*x1, y1, x2, y2, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::~QGraphicsLineItem +// ----------------------------------------------------------------------------- +// +QGraphicsLineItem::~QGraphicsLineItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::pen +// ----------------------------------------------------------------------------- +// +QPen QGraphicsLineItem::pen( ) const + { + SMC_MOCK_METHOD0( QPen ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::setPen +// ----------------------------------------------------------------------------- +// +void QGraphicsLineItem::setPen( + const QPen & pen ) + { + SMC_MOCK_METHOD1( void, const QPen &, pen ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::line +// ----------------------------------------------------------------------------- +// +QLineF QGraphicsLineItem::line( ) const + { + SMC_MOCK_METHOD0( QLineF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::setLine +// ----------------------------------------------------------------------------- +// +void QGraphicsLineItem::setLine( + const QLineF & line ) + { + SMC_MOCK_METHOD1( void, const QLineF &, line ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsLineItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsLineItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsLineItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsLineItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsLineItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsLineItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsLineItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsLineItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsLineItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsLineItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsLineItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::QGraphicsTextItem +// ----------------------------------------------------------------------------- +// +QGraphicsTextItem::QGraphicsTextItem( + const QString & text, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsObject( /*text, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::~QGraphicsTextItem +// ----------------------------------------------------------------------------- +// +QGraphicsTextItem::~QGraphicsTextItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::toHtml +// ----------------------------------------------------------------------------- +// +QString QGraphicsTextItem::toHtml( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setHtml +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setHtml( + const QString & html ) + { + SMC_MOCK_METHOD1( void, const QString &, html ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::toPlainText +// ----------------------------------------------------------------------------- +// +QString QGraphicsTextItem::toPlainText( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setPlainText +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setPlainText( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::font +// ----------------------------------------------------------------------------- +// +QFont QGraphicsTextItem::font( ) const + { + SMC_MOCK_METHOD0( QFont ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setFont +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setFont( + const QFont & font ) + { + SMC_MOCK_METHOD1( void, const QFont &, font ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setDefaultTextColor +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setDefaultTextColor( + const QColor & c ) + { + SMC_MOCK_METHOD1( void, const QColor &, c ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::defaultTextColor +// ----------------------------------------------------------------------------- +// +QColor QGraphicsTextItem::defaultTextColor( ) const + { + SMC_MOCK_METHOD0( QColor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsTextItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsTextItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsTextItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsTextItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsTextItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsTextItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setTextWidth +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setTextWidth( + qreal width ) + { + SMC_MOCK_METHOD1( void, qreal, width ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::textWidth +// ----------------------------------------------------------------------------- +// +qreal QGraphicsTextItem::textWidth( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::adjustSize +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::adjustSize( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setDocument +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setDocument( + QTextDocument * document ) + { + SMC_MOCK_METHOD1( void, QTextDocument *, document ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::document +// ----------------------------------------------------------------------------- +// +QTextDocument * QGraphicsTextItem::document( ) const + { + SMC_MOCK_METHOD0( QTextDocument * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setTextInteractionFlags +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setTextInteractionFlags( + Qt::TextInteractionFlags flags ) + { + //SMC_MOCK_METHOD1( void, tiFlag, flags ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::textInteractionFlags +// ----------------------------------------------------------------------------- +// +Qt::TextInteractionFlags QGraphicsTextItem::textInteractionFlags( ) const + { + typedef QFlags tiFlag; + SMC_MOCK_METHOD0( tiFlag ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setTabChangesFocus +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setTabChangesFocus( + bool b ) + { + SMC_MOCK_METHOD1( void, bool, b ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::tabChangesFocus +// ----------------------------------------------------------------------------- +// +bool QGraphicsTextItem::tabChangesFocus( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setOpenExternalLinks +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setOpenExternalLinks( + bool open ) + { + SMC_MOCK_METHOD1( void, bool, open ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::openExternalLinks +// ----------------------------------------------------------------------------- +// +bool QGraphicsTextItem::openExternalLinks( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setTextCursor +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setTextCursor( + const QTextCursor & cursor ) + { + SMC_MOCK_METHOD1( void, const QTextCursor &, cursor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::textCursor +// ----------------------------------------------------------------------------- +// +QTextCursor QGraphicsTextItem::textCursor( ) const + { + SMC_MOCK_METHOD0( QTextCursor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::linkActivated +// ----------------------------------------------------------------------------- +// +/*void QGraphicsTextItem::linkActivated( + const QString & ) + { + SMC_MOCK_METHOD1( void, const QString, & ) + }*/ + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::linkHovered +// ----------------------------------------------------------------------------- +// +/*void QGraphicsTextItem::linkHovered( + const QString & ) + { + SMC_MOCK_METHOD1( void, const QString, & ) + }*/ + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::sceneEvent +// ----------------------------------------------------------------------------- +// +bool QGraphicsTextItem::sceneEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::mousePressEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::mousePressEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::mouseMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::mouseMoveEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::mouseReleaseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::mouseReleaseEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::mouseDoubleClickEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::mouseDoubleClickEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::contextMenuEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::contextMenuEvent( + QGraphicsSceneContextMenuEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneContextMenuEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::keyPressEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::keyPressEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::keyReleaseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::keyReleaseEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::focusInEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::focusInEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::focusOutEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::focusOutEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::dragEnterEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::dragEnterEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::dragLeaveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::dragLeaveEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::dragMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::dragMoveEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::dropEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::dropEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::inputMethodEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::inputMethodEvent( + QInputMethodEvent * event ) + { + SMC_MOCK_METHOD1( void, QInputMethodEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::hoverEnterEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::hoverEnterEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::hoverMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::hoverMoveEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::hoverLeaveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::hoverLeaveEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::inputMethodQuery +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsTextItem::inputMethodQuery( + Qt::InputMethodQuery query ) const + { + SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, query ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsTextItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsTextItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsTextItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsTextItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::QGraphicsItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem::QGraphicsItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::~QGraphicsItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem::~QGraphicsItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::scene +// ----------------------------------------------------------------------------- +// +QGraphicsScene * QGraphicsItem::scene( ) const + { + SMC_MOCK_METHOD0( QGraphicsScene * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::parentItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsItem::parentItem( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::topLevelItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsItem::topLevelItem( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::parentObject +// ----------------------------------------------------------------------------- +// +QGraphicsObject * QGraphicsItem::parentObject( ) const + { + SMC_MOCK_METHOD0( QGraphicsObject * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::parentWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * QGraphicsItem::parentWidget( ) const + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::topLevelWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * QGraphicsItem::topLevelWidget( ) const + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::window +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * QGraphicsItem::window( ) const + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::panel +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsItem::panel( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setParentItem +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setParentItem( + QGraphicsItem * parent ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::children +// ----------------------------------------------------------------------------- +// +QList QGraphicsItem::children( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::childItems +// ----------------------------------------------------------------------------- +// +QList QGraphicsItem::childItems( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isWidget +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isWidget( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isWindow +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isWindow( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isPanel +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isPanel( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::toGraphicsObject +// ----------------------------------------------------------------------------- +// +QGraphicsObject * QGraphicsItem::toGraphicsObject( ) + { + SMC_MOCK_METHOD0( QGraphicsObject * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::toGraphicsObject +// ----------------------------------------------------------------------------- +// +const QGraphicsObject * QGraphicsItem::toGraphicsObject( ) const + { + SMC_MOCK_METHOD0( const QGraphicsObject * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::group +// ----------------------------------------------------------------------------- +// +QGraphicsItemGroup * QGraphicsItem::group( ) const + { + SMC_MOCK_METHOD0( QGraphicsItemGroup * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setGroup +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setGroup( + QGraphicsItemGroup * group ) + { + SMC_MOCK_METHOD1( void, QGraphicsItemGroup *, group ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::flags +// ----------------------------------------------------------------------------- +// +QGraphicsItem::GraphicsItemFlags QGraphicsItem::flags( ) const + { + //SMC_MOCK_METHOD0( QGraphicsItem::GraphicsItemFlags ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setFlag +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setFlag( + GraphicsItemFlag flag, + bool enabled ) + { + SMC_MOCK_METHOD2( void, GraphicsItemFlag, flag, + bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setFlags +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setFlags( + QGraphicsItem::GraphicsItemFlags flags ) + { + //SMC_MOCK_METHOD1( void, GraphicsItemFlags, flags ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::cacheMode +// ----------------------------------------------------------------------------- +// +QGraphicsItem::CacheMode QGraphicsItem::cacheMode( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem::CacheMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setCacheMode +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setCacheMode( + QGraphicsItem::CacheMode mode, + const QSize & cacheSize ) + { + SMC_MOCK_METHOD2( void, QGraphicsItem::CacheMode, mode, + const QSize &, cacheSize ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::panelModality +// ----------------------------------------------------------------------------- +// +QGraphicsItem::PanelModality QGraphicsItem::panelModality( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem::PanelModality ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setPanelModality +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setPanelModality( + QGraphicsItem::PanelModality panelModality ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem::PanelModality, panelModality ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isBlockedByModalPanel +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isBlockedByModalPanel( + QGraphicsItem * * blockingPanel ) const + { + SMC_MOCK_METHOD1( bool, QGraphicsItem * *, blockingPanel ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::toolTip +// ----------------------------------------------------------------------------- +// +QString QGraphicsItem::toolTip( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setToolTip +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setToolTip( + const QString & toolTip ) + { + SMC_MOCK_METHOD1( void, const QString &, toolTip ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::cursor +// ----------------------------------------------------------------------------- +// +QCursor QGraphicsItem::cursor( ) const + { + SMC_MOCK_METHOD0( QCursor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setCursor +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setCursor( + const QCursor & cursor ) + { + SMC_MOCK_METHOD1( void, const QCursor &, cursor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::hasCursor +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::hasCursor( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::unsetCursor +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::unsetCursor( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isVisible +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isVisible( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isVisibleTo +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isVisibleTo( + const QGraphicsItem * parent ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, parent ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setVisible +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setVisible( + bool visible ) + { + SMC_MOCK_METHOD1( void, bool, visible ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isEnabled +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isEnabled( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setEnabled +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setEnabled( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isSelected +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isSelected( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setSelected +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setSelected( + bool selected ) + { + SMC_MOCK_METHOD1( void, bool, selected ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::acceptDrops +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::acceptDrops( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setAcceptDrops +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setAcceptDrops( + bool on ) + { + SMC_MOCK_METHOD1( void, bool, on ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::opacity +// ----------------------------------------------------------------------------- +// +qreal QGraphicsItem::opacity( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::effectiveOpacity +// ----------------------------------------------------------------------------- +// +qreal QGraphicsItem::effectiveOpacity( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setOpacity +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setOpacity( + qreal opacity ) + { + SMC_MOCK_METHOD1( void, qreal, opacity ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::graphicsEffect +// ----------------------------------------------------------------------------- +// +QGraphicsEffect * QGraphicsItem::graphicsEffect( ) const + { + SMC_MOCK_METHOD0( QGraphicsEffect * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setGraphicsEffect +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setGraphicsEffect( + QGraphicsEffect * effect ) + { + SMC_MOCK_METHOD1( void, QGraphicsEffect *, effect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::acceptedMouseButtons +// ----------------------------------------------------------------------------- +// +Qt::MouseButtons QGraphicsItem::acceptedMouseButtons( ) const + { + //SMC_MOCK_METHOD0( Qt::MouseButtons ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setAcceptedMouseButtons +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setAcceptedMouseButtons( + Qt::MouseButtons buttons ) + { + //SMC_MOCK_METHOD1( void, Qt::MouseButtons, buttons ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::acceptsHoverEvents +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::acceptsHoverEvents( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setAcceptsHoverEvents +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setAcceptsHoverEvents( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::acceptHoverEvents +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::acceptHoverEvents( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setAcceptHoverEvents +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setAcceptHoverEvents( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::acceptTouchEvents +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::acceptTouchEvents( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setAcceptTouchEvents +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setAcceptTouchEvents( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::filtersChildEvents +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::filtersChildEvents( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setFiltersChildEvents +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setFiltersChildEvents( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::handlesChildEvents +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::handlesChildEvents( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setHandlesChildEvents +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setHandlesChildEvents( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isActive +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isActive( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setActive +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setActive( + bool active ) + { + SMC_MOCK_METHOD1( void, bool, active ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::hasFocus +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::hasFocus( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setFocus +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setFocus( + Qt::FocusReason focusReason ) + { + SMC_MOCK_METHOD1( void, Qt::FocusReason, focusReason ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::clearFocus +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::clearFocus( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::focusProxy +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsItem::focusProxy( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setFocusProxy +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setFocusProxy( + QGraphicsItem * item ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::focusItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsItem::focusItem( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::focusScopeItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsItem::focusScopeItem( ) const + { + SMC_MOCK_METHOD0( QGraphicsItem * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::grabMouse +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::grabMouse( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::ungrabMouse +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::ungrabMouse( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::grabKeyboard +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::grabKeyboard( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::ungrabKeyboard +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::ungrabKeyboard( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::pos +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::pos( ) const + { + SMC_MOCK_METHOD0( QPointF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setX +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setX( + qreal x ) + { + SMC_MOCK_METHOD1( void, qreal, x ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setY +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setY( + qreal y ) + { + SMC_MOCK_METHOD1( void, qreal, y ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::scenePos +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::scenePos( ) const + { + SMC_MOCK_METHOD0( QPointF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setPos +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setPos( + const QPointF & pos ) + { + SMC_MOCK_METHOD1( void, const QPointF &, pos ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::ensureVisible +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::ensureVisible( + const QRectF & rect, + int xmargin, + int ymargin ) + { + SMC_MOCK_METHOD3( void, const QRectF &, rect, + int, xmargin, + int, ymargin ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::matrix +// ----------------------------------------------------------------------------- +// +QMatrix QGraphicsItem::matrix( ) const + { + SMC_MOCK_METHOD0( QMatrix ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::sceneMatrix +// ----------------------------------------------------------------------------- +// +QMatrix QGraphicsItem::sceneMatrix( ) const + { + SMC_MOCK_METHOD0( QMatrix ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setMatrix +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setMatrix( + const QMatrix & matrix, + bool combine ) + { + SMC_MOCK_METHOD2( void, const QMatrix &, matrix, + bool, combine ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::resetMatrix +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::resetMatrix( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::transform +// ----------------------------------------------------------------------------- +// +QTransform QGraphicsItem::transform( ) const + { + SMC_MOCK_METHOD0( QTransform ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::sceneTransform +// ----------------------------------------------------------------------------- +// +QTransform QGraphicsItem::sceneTransform( ) const + { + SMC_MOCK_METHOD0( QTransform ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::deviceTransform +// ----------------------------------------------------------------------------- +// +QTransform QGraphicsItem::deviceTransform( + const QTransform & viewportTransform ) const + { + SMC_MOCK_METHOD1( QTransform, const QTransform &, viewportTransform ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::itemTransform +// ----------------------------------------------------------------------------- +// +QTransform QGraphicsItem::itemTransform( + const QGraphicsItem * other, + bool * ok ) const + { + SMC_MOCK_METHOD2( QTransform, const QGraphicsItem *, other, + bool *, ok ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setTransform +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setTransform( + const QTransform & matrix, + bool combine ) + { + SMC_MOCK_METHOD2( void, const QTransform &, matrix, + bool, combine ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::resetTransform +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::resetTransform( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::rotate +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::rotate( + qreal angle ) + { + SMC_MOCK_METHOD1( void, qreal, angle ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::scale +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::scale( + qreal sx, + qreal sy ) + { + SMC_MOCK_METHOD2( void, qreal, sx, + qreal, sy ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::shear +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::shear( + qreal sh, + qreal sv ) + { + SMC_MOCK_METHOD2( void, qreal, sh, + qreal, sv ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::translate +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::translate( + qreal dx, + qreal dy ) + { + SMC_MOCK_METHOD2( void, qreal, dx, + qreal, dy ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setRotation +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setRotation( + qreal angle ) + { + SMC_MOCK_METHOD1( void, qreal, angle ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::rotation +// ----------------------------------------------------------------------------- +// +qreal QGraphicsItem::rotation( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setScale +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setScale( + qreal scale ) + { + SMC_MOCK_METHOD1( void, qreal, scale ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::scale +// ----------------------------------------------------------------------------- +// +qreal QGraphicsItem::scale( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::transformations +// ----------------------------------------------------------------------------- +// +QList QGraphicsItem::transformations( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setTransformations +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setTransformations( + const QList & transformations ) + { + SMC_MOCK_METHOD1( void, const QList &, transformations ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::transformOriginPoint +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::transformOriginPoint( ) const + { + SMC_MOCK_METHOD0( QPointF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setTransformOriginPoint +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setTransformOriginPoint( + const QPointF & origin ) + { + SMC_MOCK_METHOD1( void, const QPointF &, origin ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::advance +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::advance( + int phase ) + { + SMC_MOCK_METHOD1( void, int, phase ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::zValue +// ----------------------------------------------------------------------------- +// +qreal QGraphicsItem::zValue( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setZValue +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setZValue( + qreal z ) + { + SMC_MOCK_METHOD1( void, qreal, z ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::stackBefore +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::stackBefore( + const QGraphicsItem * sibling ) + { + SMC_MOCK_METHOD1( void, const QGraphicsItem *, sibling ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::childrenBoundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::childrenBoundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::sceneBoundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::sceneBoundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isClipped +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isClipped( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::clipPath +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::clipPath( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::collidesWithItem +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::collidesWithItem( + const QGraphicsItem * other, + Qt::ItemSelectionMode mode ) const + { + SMC_MOCK_METHOD2( bool, const QGraphicsItem *, other, + Qt::ItemSelectionMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::collidesWithPath +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::collidesWithPath( + const QPainterPath & path, + Qt::ItemSelectionMode mode ) const + { + SMC_MOCK_METHOD2( bool, const QPainterPath &, path, + Qt::ItemSelectionMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::collidingItems +// ----------------------------------------------------------------------------- +// +QList QGraphicsItem::collidingItems( + Qt::ItemSelectionMode mode ) const + { + SMC_MOCK_METHOD1( QList , Qt::ItemSelectionMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isObscured +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isObscured( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isObscured +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isObscured( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( bool, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::boundingRegion +// ----------------------------------------------------------------------------- +// +QRegion QGraphicsItem::boundingRegion( + const QTransform & itemToDeviceTransform ) const + { + SMC_MOCK_METHOD1( QRegion, const QTransform &, itemToDeviceTransform ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::boundingRegionGranularity +// ----------------------------------------------------------------------------- +// +qreal QGraphicsItem::boundingRegionGranularity( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setBoundingRegionGranularity +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setBoundingRegionGranularity( + qreal granularity ) + { + SMC_MOCK_METHOD1( void, qreal, granularity ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::update +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::update( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::scroll +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::scroll( + qreal dx, + qreal dy, + const QRectF & rect ) + { + SMC_MOCK_METHOD3( void, qreal, dx, + qreal, dy, + const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToItem +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::mapToItem( + const QGraphicsItem * item, + const QPointF & point ) const + { + SMC_MOCK_METHOD2( QPointF, const QGraphicsItem *, item, + const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToParent +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::mapToParent( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( QPointF, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToScene +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::mapToScene( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( QPointF, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToItem +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapToItem( + const QGraphicsItem * item, + const QRectF & rect ) const + { + SMC_MOCK_METHOD2( QPolygonF, const QGraphicsItem *, item, + const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToParent +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapToParent( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToScene +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapToScene( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapRectToItem +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::mapRectToItem( + const QGraphicsItem * item, + const QRectF & rect ) const + { + SMC_MOCK_METHOD2( QRectF, const QGraphicsItem *, item, + const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapRectToParent +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::mapRectToParent( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QRectF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapRectToScene +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::mapRectToScene( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QRectF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToItem +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapToItem( + const QGraphicsItem * item, + const QPolygonF & polygon ) const + { + SMC_MOCK_METHOD2( QPolygonF, const QGraphicsItem *, item, + const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToParent +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapToParent( + const QPolygonF & polygon ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToScene +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapToScene( + const QPolygonF & polygon ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToItem +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::mapToItem( + const QGraphicsItem * item, + const QPainterPath & path ) const + { + SMC_MOCK_METHOD2( QPainterPath, const QGraphicsItem *, item, + const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToParent +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::mapToParent( + const QPainterPath & path ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapToScene +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::mapToScene( + const QPainterPath & path ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromItem +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::mapFromItem( + const QGraphicsItem * item, + const QPointF & point ) const + { + SMC_MOCK_METHOD2( QPointF, const QGraphicsItem *, item, + const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromParent +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::mapFromParent( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( QPointF, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromScene +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsItem::mapFromScene( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( QPointF, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromItem +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapFromItem( + const QGraphicsItem * item, + const QRectF & rect ) const + { + SMC_MOCK_METHOD2( QPolygonF, const QGraphicsItem *, item, + const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromParent +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapFromParent( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromScene +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapFromScene( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapRectFromItem +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::mapRectFromItem( + const QGraphicsItem * item, + const QRectF & rect ) const + { + SMC_MOCK_METHOD2( QRectF, const QGraphicsItem *, item, + const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapRectFromParent +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::mapRectFromParent( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QRectF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapRectFromScene +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsItem::mapRectFromScene( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( QRectF, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromItem +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapFromItem( + const QGraphicsItem * item, + const QPolygonF & polygon ) const + { + SMC_MOCK_METHOD2( QPolygonF, const QGraphicsItem *, item, + const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromParent +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapFromParent( + const QPolygonF & polygon ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromScene +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsItem::mapFromScene( + const QPolygonF & polygon ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromItem +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::mapFromItem( + const QGraphicsItem * item, + const QPainterPath & path ) const + { + SMC_MOCK_METHOD2( QPainterPath, const QGraphicsItem *, item, + const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromParent +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::mapFromParent( + const QPainterPath & path ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mapFromScene +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsItem::mapFromScene( + const QPainterPath & path ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isAncestorOf +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isAncestorOf( + const QGraphicsItem * child ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, child ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::commonAncestorItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsItem::commonAncestorItem( + const QGraphicsItem * other ) const + { + SMC_MOCK_METHOD1( QGraphicsItem *, const QGraphicsItem *, other ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::isUnderMouse +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::isUnderMouse( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::data +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsItem::data( + int key ) const + { + SMC_MOCK_METHOD1( QVariant, int, key ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setData +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setData( + int key, + const QVariant & value ) + { + SMC_MOCK_METHOD2( void, int, key, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::inputMethodHints +// ----------------------------------------------------------------------------- +// +Qt::InputMethodHints QGraphicsItem::inputMethodHints( ) const + { + //SMC_MOCK_METHOD0( Qt::InputMethodHints ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setInputMethodHints +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setInputMethodHints( + Qt::InputMethodHints hints ) + { + //SMC_MOCK_METHOD1( void, Qt::InputMethodHints, hints ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::installSceneEventFilter +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::installSceneEventFilter( + QGraphicsItem * filterItem ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem *, filterItem ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::removeSceneEventFilter +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::removeSceneEventFilter( + QGraphicsItem * filterItem ) + { + SMC_MOCK_METHOD1( void, QGraphicsItem *, filterItem ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::updateMicroFocus +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::updateMicroFocus( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::sceneEventFilter +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::sceneEventFilter( + QGraphicsItem * watched, + QEvent * event ) + { + SMC_MOCK_METHOD2( bool, QGraphicsItem *, watched, + QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::sceneEvent +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::sceneEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::contextMenuEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::contextMenuEvent( + QGraphicsSceneContextMenuEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneContextMenuEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::dragEnterEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::dragEnterEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::dragLeaveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::dragLeaveEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::dragMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::dragMoveEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::dropEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::dropEvent( + QGraphicsSceneDragDropEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneDragDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::focusInEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::focusInEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::focusOutEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::focusOutEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::hoverEnterEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::hoverEnterEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::hoverMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::hoverMoveEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::hoverLeaveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::hoverLeaveEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::keyPressEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::keyPressEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::keyReleaseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::keyReleaseEvent( + QKeyEvent * event ) + { + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mousePressEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::mousePressEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mouseMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::mouseMoveEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mouseReleaseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::mouseReleaseEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::mouseDoubleClickEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::mouseDoubleClickEvent( + QGraphicsSceneMouseEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::wheelEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::wheelEvent( + QGraphicsSceneWheelEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneWheelEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::inputMethodEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::inputMethodEvent( + QInputMethodEvent * event ) + { + SMC_MOCK_METHOD1( void, QInputMethodEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::inputMethodQuery +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsItem::inputMethodQuery( + Qt::InputMethodQuery query ) const + { + SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, query ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::itemChange +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsItem::itemChange( + GraphicsItemChange change, + const QVariant & value ) + { + SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::QGraphicsItem +// ----------------------------------------------------------------------------- +// +QGraphicsItem::QGraphicsItem( + QGraphicsItemPrivate & dd, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::addToIndex +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::addToIndex( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::removeFromIndex +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::removeFromIndex( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsItem::prepareGeometryChange +// ----------------------------------------------------------------------------- +// +void QGraphicsItem::prepareGeometryChange( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::QGraphicsEllipseItem +// ----------------------------------------------------------------------------- +// +QGraphicsEllipseItem::QGraphicsEllipseItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::QGraphicsEllipseItem +// ----------------------------------------------------------------------------- +// +QGraphicsEllipseItem::QGraphicsEllipseItem( + const QRectF & rect, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*rect, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::QGraphicsEllipseItem +// ----------------------------------------------------------------------------- +// +QGraphicsEllipseItem::QGraphicsEllipseItem( + qreal x, + qreal y, + qreal w, + qreal h, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*x, y, w, h, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::~QGraphicsEllipseItem +// ----------------------------------------------------------------------------- +// +QGraphicsEllipseItem::~QGraphicsEllipseItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::rect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsEllipseItem::rect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::setRect +// ----------------------------------------------------------------------------- +// +void QGraphicsEllipseItem::setRect( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::startAngle +// ----------------------------------------------------------------------------- +// +int QGraphicsEllipseItem::startAngle( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::setStartAngle +// ----------------------------------------------------------------------------- +// +void QGraphicsEllipseItem::setStartAngle( + int angle ) + { + SMC_MOCK_METHOD1( void, int, angle ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::spanAngle +// ----------------------------------------------------------------------------- +// +int QGraphicsEllipseItem::spanAngle( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::setSpanAngle +// ----------------------------------------------------------------------------- +// +void QGraphicsEllipseItem::setSpanAngle( + int angle ) + { + SMC_MOCK_METHOD1( void, int, angle ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsEllipseItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsEllipseItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsEllipseItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsEllipseItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsEllipseItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsEllipseItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsEllipseItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsEllipseItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsEllipseItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsEllipseItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsEllipseItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::QGraphicsPixmapItem +// ----------------------------------------------------------------------------- +// +QGraphicsPixmapItem::QGraphicsPixmapItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::QGraphicsPixmapItem +// ----------------------------------------------------------------------------- +// +QGraphicsPixmapItem::QGraphicsPixmapItem( + const QPixmap & /*pixmap*/, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QGraphicsItem( /*pixmap, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::~QGraphicsPixmapItem +// ----------------------------------------------------------------------------- +// +QGraphicsPixmapItem::~QGraphicsPixmapItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::pixmap +// ----------------------------------------------------------------------------- +// +QPixmap QGraphicsPixmapItem::pixmap( ) const + { + SMC_MOCK_METHOD0( QPixmap ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::setPixmap +// ----------------------------------------------------------------------------- +// +void QGraphicsPixmapItem::setPixmap( + const QPixmap & pixmap ) + { + SMC_MOCK_METHOD1( void, const QPixmap &, pixmap ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::transformationMode +// ----------------------------------------------------------------------------- +// +Qt::TransformationMode QGraphicsPixmapItem::transformationMode( ) const + { + SMC_MOCK_METHOD0( Qt::TransformationMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::setTransformationMode +// ----------------------------------------------------------------------------- +// +void QGraphicsPixmapItem::setTransformationMode( + Qt::TransformationMode mode ) + { + SMC_MOCK_METHOD1( void, Qt::TransformationMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::offset +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsPixmapItem::offset( ) const + { + SMC_MOCK_METHOD0( QPointF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::setOffset +// ----------------------------------------------------------------------------- +// +void QGraphicsPixmapItem::setOffset( + const QPointF & offset ) + { + SMC_MOCK_METHOD1( void, const QPointF &, offset ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsPixmapItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsPixmapItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsPixmapItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsPixmapItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsPixmapItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsPixmapItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsPixmapItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::shapeMode +// ----------------------------------------------------------------------------- +// +QGraphicsPixmapItem::ShapeMode QGraphicsPixmapItem::shapeMode( ) const + { + SMC_MOCK_METHOD0( QGraphicsPixmapItem::ShapeMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::setShapeMode +// ----------------------------------------------------------------------------- +// +void QGraphicsPixmapItem::setShapeMode( + QGraphicsPixmapItem::ShapeMode mode ) + { + SMC_MOCK_METHOD1( void, QGraphicsPixmapItem::ShapeMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsPixmapItem::supportsExtension( + QGraphicsItem::Extension extension ) const + { + SMC_MOCK_METHOD1( bool, QGraphicsItem::Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsPixmapItem::setExtension( + QGraphicsItem::Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, QGraphicsItem::Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPixmapItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsPixmapItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::QGraphicsRectItem +// ----------------------------------------------------------------------------- +// +QGraphicsRectItem::QGraphicsRectItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::QGraphicsRectItem +// ----------------------------------------------------------------------------- +// +QGraphicsRectItem::QGraphicsRectItem( + const QRectF & /*rect*/, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*rect, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::QGraphicsRectItem +// ----------------------------------------------------------------------------- +// +QGraphicsRectItem::QGraphicsRectItem( + qreal /*x*/, + qreal /*y*/, + qreal /*w*/, + qreal /*h*/, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*x, y, w, h, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::~QGraphicsRectItem +// ----------------------------------------------------------------------------- +// +QGraphicsRectItem::~QGraphicsRectItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::rect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsRectItem::rect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::setRect +// ----------------------------------------------------------------------------- +// +void QGraphicsRectItem::setRect( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsRectItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsRectItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsRectItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsRectItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsRectItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsRectItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsRectItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsRectItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsRectItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsRectItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsRectItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + +// ----------------------------------------------------------------------------- +// QGraphicsObject::QGraphicsObject +// ----------------------------------------------------------------------------- +// +/*QGraphicsObject::QGraphicsObject(QGraphicsItem *parent) + : QGraphicsItem(parent) +{ +} +*/ + +// ----------------------------------------------------------------------------- +// QGraphicsObject::QGraphicsObject +// ----------------------------------------------------------------------------- +// +QGraphicsObject::QGraphicsObject( + QGraphicsItemPrivate & /*dd*/, + QGraphicsItem * parent, + QGraphicsScene * s ) + : QObject( s ), QGraphicsItem(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::children +// ----------------------------------------------------------------------------- +// +/*const QObjectList & QGraphicsObject::children( ) const + { + SMC_MOCK_METHOD0( const QObjectList & ) + }*/ + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::grabGesture +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::grabGesture( + Qt::GestureType type, + Qt::GestureFlags flags ) + { + /*SMC_MOCK_METHOD2( void, Qt::GestureType, type, + QFlags, theFlags )*/ + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::ungrabGesture +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::ungrabGesture( + Qt::GestureType type ) + { + SMC_MOCK_METHOD1( void, Qt::GestureType, type ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::updateMicroFocus +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::updateMicroFocus( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::parentChanged +// ----------------------------------------------------------------------------- +// +/*void QGraphicsObject::parentChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::opacityChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::opacityChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::visibleChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::visibleChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::enabledChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::enabledChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::xChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::xChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::yChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::yChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::zChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::zChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::rotationChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::rotationChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::scaleChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::scaleChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::childrenChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::childrenChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::widthChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::widthChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsObject::heightChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsObject::heightChanged( ) + { + SMC_MOCK_METHOD0( void ) + }*/ + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::QGraphicsPolygonItem +// ----------------------------------------------------------------------------- +// +QGraphicsPolygonItem::QGraphicsPolygonItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::QGraphicsPolygonItem +// ----------------------------------------------------------------------------- +// +QGraphicsPolygonItem::QGraphicsPolygonItem( + const QPolygonF & /*polygon*/, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*polygon, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::~QGraphicsPolygonItem +// ----------------------------------------------------------------------------- +// +QGraphicsPolygonItem::~QGraphicsPolygonItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::polygon +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsPolygonItem::polygon( ) const + { + SMC_MOCK_METHOD0( QPolygonF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::setPolygon +// ----------------------------------------------------------------------------- +// +void QGraphicsPolygonItem::setPolygon( + const QPolygonF & polygon ) + { + SMC_MOCK_METHOD1( void, const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::fillRule +// ----------------------------------------------------------------------------- +// +Qt::FillRule QGraphicsPolygonItem::fillRule( ) const + { + SMC_MOCK_METHOD0( Qt::FillRule ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::setFillRule +// ----------------------------------------------------------------------------- +// +void QGraphicsPolygonItem::setFillRule( + Qt::FillRule rule ) + { + SMC_MOCK_METHOD1( void, Qt::FillRule, rule ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsPolygonItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsPolygonItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsPolygonItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsPolygonItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsPolygonItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsPolygonItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsPolygonItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsPolygonItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsPolygonItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPolygonItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsPolygonItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::QGraphicsPathItem +// ----------------------------------------------------------------------------- +// +QGraphicsPathItem::QGraphicsPathItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::QGraphicsPathItem +// ----------------------------------------------------------------------------- +// +QGraphicsPathItem::QGraphicsPathItem( + const QPainterPath & /*path*/, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*path, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::~QGraphicsPathItem +// ----------------------------------------------------------------------------- +// +QGraphicsPathItem::~QGraphicsPathItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::path +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsPathItem::path( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::setPath +// ----------------------------------------------------------------------------- +// +void QGraphicsPathItem::setPath( + const QPainterPath & path ) + { + SMC_MOCK_METHOD1( void, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsPathItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsPathItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsPathItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsPathItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsPathItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsPathItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsPathItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsPathItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsPathItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsPathItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsPathItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::QGraphicsSimpleTextItem +// ----------------------------------------------------------------------------- +// +QGraphicsSimpleTextItem::QGraphicsSimpleTextItem( + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::QGraphicsSimpleTextItem +// ----------------------------------------------------------------------------- +// +QGraphicsSimpleTextItem::QGraphicsSimpleTextItem( + const QString & /*text*/, + QGraphicsItem * /*parent*/, + QGraphicsScene * /*scene*/ ) + //: + //QAbstractGraphicsShapeItem( /*text, parent, scene*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::~QGraphicsSimpleTextItem +// ----------------------------------------------------------------------------- +// +QGraphicsSimpleTextItem::~QGraphicsSimpleTextItem( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::setText +// ----------------------------------------------------------------------------- +// +void QGraphicsSimpleTextItem::setText( + const QString & text ) + { + SMC_MOCK_METHOD1( void, const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::text +// ----------------------------------------------------------------------------- +// +QString QGraphicsSimpleTextItem::text( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::setFont +// ----------------------------------------------------------------------------- +// +void QGraphicsSimpleTextItem::setFont( + const QFont & font ) + { + SMC_MOCK_METHOD1( void, const QFont &, font ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::font +// ----------------------------------------------------------------------------- +// +QFont QGraphicsSimpleTextItem::font( ) const + { + SMC_MOCK_METHOD0( QFont ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsSimpleTextItem::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsSimpleTextItem::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::contains +// ----------------------------------------------------------------------------- +// +bool QGraphicsSimpleTextItem::contains( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsSimpleTextItem::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::isObscuredBy +// ----------------------------------------------------------------------------- +// +bool QGraphicsSimpleTextItem::isObscuredBy( + const QGraphicsItem * item ) const + { + SMC_MOCK_METHOD1( bool, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::opaqueArea +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsSimpleTextItem::opaqueArea( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::type +// ----------------------------------------------------------------------------- +// +int QGraphicsSimpleTextItem::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::supportsExtension +// ----------------------------------------------------------------------------- +// +bool QGraphicsSimpleTextItem::supportsExtension( + Extension extension ) const + { + SMC_MOCK_METHOD1( bool, Extension, extension ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::setExtension +// ----------------------------------------------------------------------------- +// +void QGraphicsSimpleTextItem::setExtension( + Extension extension, + const QVariant & variant ) + { + SMC_MOCK_METHOD2( void, Extension, extension, + const QVariant &, variant ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsSimpleTextItem::extension +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsSimpleTextItem::extension( + const QVariant & variant ) const + { + SMC_MOCK_METHOD1( QVariant, const QVariant &, variant ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtgui/mock_qgraphicsview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtgui/mock_qgraphicsview.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,1175 @@ +/* +* 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 +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== +QWidget::QWidget(QWidget* parent, Qt::WindowFlags f) + : QObject(parent) +{ +} + +QWidget::~QWidget() +{ +} + +QFrame::QFrame(QWidget* parent, Qt::WindowFlags f) + : QWidget(parent) +{ +} + +QFrame::~QFrame() +{ +} + +QAbstractScrollArea::QAbstractScrollArea(QWidget *parent) + :QFrame(parent) +{ +} + +QAbstractScrollArea::~QAbstractScrollArea() +{ +} + +// ----------------------------------------------------------------------------- +// QGraphicsView::QGraphicsView +// ----------------------------------------------------------------------------- +// +QGraphicsView::QGraphicsView( + QWidget * parent ) + : QAbstractScrollArea( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::QGraphicsView +// ----------------------------------------------------------------------------- +// +QGraphicsView::QGraphicsView( + QGraphicsScene * scene, + QWidget * parent ) + //: + //QAbstractScrollArea( /*scene, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::~QGraphicsView +// ----------------------------------------------------------------------------- +// +QGraphicsView::~QGraphicsView( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::sizeHint +// ----------------------------------------------------------------------------- +// +QSize QGraphicsView::sizeHint( ) const + { + SMC_MOCK_METHOD0( QSize ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::renderHints +// ----------------------------------------------------------------------------- +// +QPainter::RenderHints QGraphicsView::renderHints( ) const + { + SMC_MOCK_METHOD0( QPainter::RenderHints ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setRenderHint +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setRenderHint( + QPainter::RenderHint hint, + bool enabled ) + { + //SMC_MOCK_METHOD2( void, QPainter::RenderHint, hint, + // bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setRenderHints +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setRenderHints( + QPainter::RenderHints hints ) + { + //SMC_MOCK_METHOD1( void, QPainter::RenderHints, hints ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::alignment +// ----------------------------------------------------------------------------- +// +Qt::Alignment QGraphicsView::alignment( ) const + { + SMC_MOCK_METHOD0( Qt::Alignment ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setAlignment +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setAlignment( + Qt::Alignment alignment ) + { + //SMC_MOCK_METHOD1( void, Qt::Alignment, alignment ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::transformationAnchor +// ----------------------------------------------------------------------------- +// +QGraphicsView::ViewportAnchor QGraphicsView::transformationAnchor( ) const + { + SMC_MOCK_METHOD0( ViewportAnchor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setTransformationAnchor +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setTransformationAnchor( + ViewportAnchor anchor ) + { + //SMC_MOCK_METHOD1( void, ViewportAnchor, anchor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::resizeAnchor +// ----------------------------------------------------------------------------- +// +/* +ViewportAnchor QGraphicsView::resizeAnchor( ) const + { + SMC_MOCK_METHOD0( ViewportAnchor ) + } +*/ + +// ----------------------------------------------------------------------------- +// QGraphicsView::setResizeAnchor +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setResizeAnchor( + QGraphicsView::ViewportAnchor anchor ) + { + //SMC_MOCK_METHOD1( void, ViewportAnchor, anchor ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::viewportUpdateMode +// ----------------------------------------------------------------------------- +// +QGraphicsView::ViewportUpdateMode QGraphicsView::viewportUpdateMode( ) const + { + SMC_MOCK_METHOD0( ViewportUpdateMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setViewportUpdateMode +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setViewportUpdateMode( + QGraphicsView::ViewportUpdateMode mode ) + { + //SMC_MOCK_METHOD1( void, ViewportUpdateMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::optimizationFlags +// ----------------------------------------------------------------------------- +// +QGraphicsView::OptimizationFlags QGraphicsView::optimizationFlags( ) const + { + SMC_MOCK_METHOD0( OptimizationFlags ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setOptimizationFlag +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setOptimizationFlag( + QGraphicsView::OptimizationFlag flag, + bool enabled ) + { + SMC_MOCK_METHOD2( void, OptimizationFlag, flag, + bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setOptimizationFlags +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setOptimizationFlags( + OptimizationFlags flags ) + { + //SMC_MOCK_METHOD1( void, OptimizationFlags, flags ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::dragMode +// ----------------------------------------------------------------------------- +// +QGraphicsView::DragMode QGraphicsView::dragMode( ) const + { + SMC_MOCK_METHOD0( DragMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setDragMode +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setDragMode( + DragMode mode ) + { + //SMC_MOCK_METHOD1( void, DragMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::rubberBandSelectionMode +// ----------------------------------------------------------------------------- +// +Qt::ItemSelectionMode QGraphicsView::rubberBandSelectionMode( ) const + { + SMC_MOCK_METHOD0( Qt::ItemSelectionMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setRubberBandSelectionMode +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setRubberBandSelectionMode( + Qt::ItemSelectionMode mode ) + { + //SMC_MOCK_METHOD1( void, Qt::ItemSelectionMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::cacheMode +// ----------------------------------------------------------------------------- +// +QGraphicsView::CacheMode QGraphicsView::cacheMode( ) const + { + SMC_MOCK_METHOD0( CacheMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setCacheMode +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setCacheMode( + CacheMode mode ) + { + //SMC_MOCK_METHOD1( void, CacheMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::resetCachedContent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::resetCachedContent( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::isInteractive +// ----------------------------------------------------------------------------- +// +bool QGraphicsView::isInteractive( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setInteractive +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setInteractive( + bool allowed ) + { + SMC_MOCK_METHOD1( void, bool, allowed ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::scene +// ----------------------------------------------------------------------------- +// +QGraphicsScene * QGraphicsView::scene( ) const + { + SMC_MOCK_METHOD0( QGraphicsScene * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setScene +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setScene( + QGraphicsScene * scene ) + { + //SMC_MOCK_METHOD1( void, QGraphicsScene *, scene ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::sceneRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsView::sceneRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setSceneRect +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setSceneRect( + const QRectF & rect ) + { + //SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::matrix +// ----------------------------------------------------------------------------- +// +QMatrix QGraphicsView::matrix( ) const + { + SMC_MOCK_METHOD0( QMatrix ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setMatrix +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setMatrix( + const QMatrix & matrix, + bool combine ) + { + //SMC_MOCK_METHOD2( void, const QMatrix &, matrix, + // bool, combine ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::resetMatrix +// ----------------------------------------------------------------------------- +// +void QGraphicsView::resetMatrix( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::transform +// ----------------------------------------------------------------------------- +// +QTransform QGraphicsView::transform( ) const + { + SMC_MOCK_METHOD0( QTransform ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::viewportTransform +// ----------------------------------------------------------------------------- +// +QTransform QGraphicsView::viewportTransform( ) const + { + SMC_MOCK_METHOD0( QTransform ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::isTransformed +// ----------------------------------------------------------------------------- +// +bool QGraphicsView::isTransformed( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setTransform +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setTransform( + const QTransform & matrix, + bool combine ) + { + //SMC_MOCK_METHOD2( void, const QTransform &, matrix, + // bool, combine ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::resetTransform +// ----------------------------------------------------------------------------- +// +void QGraphicsView::resetTransform( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::rotate +// ----------------------------------------------------------------------------- +// +void QGraphicsView::rotate( + qreal angle ) + { + //SMC_MOCK_METHOD1( void, qreal, angle ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::scale +// ----------------------------------------------------------------------------- +// +void QGraphicsView::scale( + qreal sx, + qreal sy ) + { + //SMC_MOCK_METHOD2( void, qreal, sx, + // qreal, sy ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::shear +// ----------------------------------------------------------------------------- +// +void QGraphicsView::shear( + qreal sh, + qreal sv ) + { + //SMC_MOCK_METHOD2( void, qreal, sh, + // qreal, sv ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::translate +// ----------------------------------------------------------------------------- +// +void QGraphicsView::translate( + qreal dx, + qreal dy ) + { + SMC_MOCK_METHOD2( void, qreal, dx, + qreal, dy ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::centerOn +// ----------------------------------------------------------------------------- +// +void QGraphicsView::centerOn( + const QPointF & pos ) + { + //SMC_MOCK_METHOD1( void, const QPointF &, pos ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::centerOn +// ----------------------------------------------------------------------------- +// +void QGraphicsView::centerOn( + const QGraphicsItem * item ) + { + //SMC_MOCK_METHOD1( void, const QGraphicsItem *, item ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::ensureVisible +// ----------------------------------------------------------------------------- +// +void QGraphicsView::ensureVisible( + const QRectF & rect, + int xmargin, + int ymargin ) + { + //SMC_MOCK_METHOD3( void, const QRectF &, rect, + // int, xmargin, + // int, ymargin ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::ensureVisible +// ----------------------------------------------------------------------------- +// +void QGraphicsView::ensureVisible( + const QGraphicsItem * item, + int xmargin, + int ymargin ) + { + //SMC_MOCK_METHOD3( void, const QGraphicsItem *, item, + // int, xmargin, + // int, ymargin ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::fitInView +// ----------------------------------------------------------------------------- +// +void QGraphicsView::fitInView( + const QRectF & rect, + Qt::AspectRatioMode aspectRadioMode ) + { + //SMC_MOCK_METHOD2( void, const QRectF &, rect, + // Qt::AspectRatioMode, aspectRadioMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::fitInView +// ----------------------------------------------------------------------------- +// +void QGraphicsView::fitInView( + const QGraphicsItem * item, + Qt::AspectRatioMode aspectRadioMode ) + { + //SMC_MOCK_METHOD2( void, const QGraphicsItem *, item, + // Qt::AspectRatioMode, aspectRadioMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::render +// ----------------------------------------------------------------------------- +// +void QGraphicsView::render( + QPainter * painter, + const QRectF & target, + const QRect & source, + Qt::AspectRatioMode aspectRatioMode ) + { + //SMC_MOCK_METHOD4( void, QPainter *, painter, + // const QRectF &, target, + // const QRect &, source, + // Qt::AspectRatioMode, aspectRatioMode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::items +// ----------------------------------------------------------------------------- +// +QList QGraphicsView::items( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::items +// ----------------------------------------------------------------------------- +// +QList QGraphicsView::items( + const QPoint & pos ) const + { + //SMC_MOCK_METHOD1( QList , const QPoint &, pos ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::items +// ----------------------------------------------------------------------------- +// +QList QGraphicsView::items( + const QRect & rect, + Qt::ItemSelectionMode mode ) const + { + //SMC_MOCK_METHOD2( QList , const QRect &, rect, + // Qt::ItemSelectionMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::items +// ----------------------------------------------------------------------------- +// +QList QGraphicsView::items( + const QPolygon & polygon, + Qt::ItemSelectionMode mode ) const + { + //SMC_MOCK_METHOD2( QList , const QPolygon &, polygon, + // Qt::ItemSelectionMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::items +// ----------------------------------------------------------------------------- +// +QList QGraphicsView::items( + const QPainterPath & path, + Qt::ItemSelectionMode mode ) const + { + //SMC_MOCK_METHOD2( QList , const QPainterPath &, path, + // Qt::ItemSelectionMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::itemAt +// ----------------------------------------------------------------------------- +// +QGraphicsItem * QGraphicsView::itemAt( + const QPoint & pos ) const + { + //SMC_MOCK_METHOD1( QGraphicsItem *, const QPoint &, pos ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapToScene +// ----------------------------------------------------------------------------- +// +QPointF QGraphicsView::mapToScene( + const QPoint & point ) const + { + //SMC_MOCK_METHOD1( QPointF, const QPoint &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapToScene +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsView::mapToScene( + const QRect & rect ) const + { + //SMC_MOCK_METHOD1( QPolygonF, const QRect &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapToScene +// ----------------------------------------------------------------------------- +// +QPolygonF QGraphicsView::mapToScene( + const QPolygon & polygon ) const + { + //SMC_MOCK_METHOD1( QPolygonF, const QPolygon &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapToScene +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsView::mapToScene( + const QPainterPath & path ) const + { + //SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapFromScene +// ----------------------------------------------------------------------------- +// +QPoint QGraphicsView::mapFromScene( + const QPointF & point ) const + { + SMC_MOCK_METHOD1( QPoint, const QPointF &, point ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapFromScene +// ----------------------------------------------------------------------------- +// +QPolygon QGraphicsView::mapFromScene( + const QRectF & rect ) const + { + //SMC_MOCK_METHOD1( QPolygon, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapFromScene +// ----------------------------------------------------------------------------- +// +QPolygon QGraphicsView::mapFromScene( + const QPolygonF & polygon ) const + { + //SMC_MOCK_METHOD1( QPolygon, const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mapFromScene +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsView::mapFromScene( + const QPainterPath & path ) const + { + //SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::inputMethodQuery +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsView::inputMethodQuery( + Qt::InputMethodQuery query ) const + { + //SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, query ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::backgroundBrush +// ----------------------------------------------------------------------------- +// +QBrush QGraphicsView::backgroundBrush( ) const + { + SMC_MOCK_METHOD0( QBrush ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setBackgroundBrush +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setBackgroundBrush( + const QBrush & brush ) + { + //SMC_MOCK_METHOD1( void, const QBrush &, brush ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::foregroundBrush +// ----------------------------------------------------------------------------- +// +QBrush QGraphicsView::foregroundBrush( ) const + { + SMC_MOCK_METHOD0( QBrush ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setForegroundBrush +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setForegroundBrush( + const QBrush & brush ) + { + //SMC_MOCK_METHOD1( void, const QBrush &, brush ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::updateScene +// ----------------------------------------------------------------------------- +// +void QGraphicsView::updateScene( + const QList & rects ) + { + //SMC_MOCK_METHOD1( Q_SLOTS : void, const QList &, rects ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::invalidateScene +// ----------------------------------------------------------------------------- +// +void QGraphicsView::invalidateScene( + const QRectF & rect, + QGraphicsScene::SceneLayers layers ) + { + //SMC_MOCK_METHOD2( void, const QRectF &, rect, + // QGraphicsScene::SceneLayers, layers ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::updateSceneRect +// ----------------------------------------------------------------------------- +// +void QGraphicsView::updateSceneRect( + const QRectF & rect ) + { + //SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::setupViewport +// ----------------------------------------------------------------------------- +// +void QGraphicsView::setupViewport( + QWidget * widget ) + { + //SMC_MOCK_METHOD1( Q_SLOTS : void, QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::QGraphicsView +// ----------------------------------------------------------------------------- +// +QGraphicsView::QGraphicsView( + QGraphicsViewPrivate &, + QWidget * parent ) + //: + //QAbstractScrollArea( /*&, parent*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::event +// ----------------------------------------------------------------------------- +// +bool QGraphicsView::event( + QEvent * event ) + { + //SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::viewportEvent +// ----------------------------------------------------------------------------- +// +bool QGraphicsView::viewportEvent( + QEvent * event ) + { + //SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::contextMenuEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::contextMenuEvent( + QContextMenuEvent * event ) + { + //SMC_MOCK_METHOD1( void, QContextMenuEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::dragEnterEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::dragEnterEvent( + QDragEnterEvent * event ) + { + //SMC_MOCK_METHOD1( void, QDragEnterEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::dragLeaveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::dragLeaveEvent( + QDragLeaveEvent * event ) + { + //SMC_MOCK_METHOD1( void, QDragLeaveEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::dragMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::dragMoveEvent( + QDragMoveEvent * event ) + { + //SMC_MOCK_METHOD1( void, QDragMoveEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::dropEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::dropEvent( + QDropEvent * event ) + { + //SMC_MOCK_METHOD1( void, QDropEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::focusInEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::focusInEvent( + QFocusEvent * event ) + { + //SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::focusNextPrevChild +// ----------------------------------------------------------------------------- +// +bool QGraphicsView::focusNextPrevChild( + bool next ) + { + //SMC_MOCK_METHOD1( bool, bool, next ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::focusOutEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::focusOutEvent( + QFocusEvent * event ) + { + //SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::keyPressEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::keyPressEvent( + QKeyEvent * event ) + { + //SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::keyReleaseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::keyReleaseEvent( + QKeyEvent * event ) + { + //SMC_MOCK_METHOD1( void, QKeyEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mouseDoubleClickEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::mouseDoubleClickEvent( + QMouseEvent * event ) + { + //SMC_MOCK_METHOD1( void, QMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mousePressEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::mousePressEvent( + QMouseEvent * event ) + { + //SMC_MOCK_METHOD1( void, QMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mouseMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::mouseMoveEvent( + QMouseEvent * event ) + { + //SMC_MOCK_METHOD1( void, QMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::mouseReleaseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::mouseReleaseEvent( + QMouseEvent * event ) + { + //SMC_MOCK_METHOD1( void, QMouseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::wheelEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::wheelEvent( + QWheelEvent * event ) + { + //SMC_MOCK_METHOD1( void, QWheelEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::paintEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::paintEvent( + QPaintEvent * event ) + { + //SMC_MOCK_METHOD1( void, QPaintEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::resizeEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::resizeEvent( + QResizeEvent * event ) + { + //SMC_MOCK_METHOD1( void, QResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::scrollContentsBy +// ----------------------------------------------------------------------------- +// +void QGraphicsView::scrollContentsBy( + int dx, + int dy ) + { + //SMC_MOCK_METHOD2( void, int, dx, + // int, dy ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::showEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::showEvent( + QShowEvent * event ) + { + //SMC_MOCK_METHOD1( void, QShowEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::inputMethodEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsView::inputMethodEvent( + QInputMethodEvent * event ) + { + //SMC_MOCK_METHOD1( void, QInputMethodEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::drawBackground +// ----------------------------------------------------------------------------- +// +void QGraphicsView::drawBackground( + QPainter * painter, + const QRectF & rect ) + { + //SMC_MOCK_METHOD2( void, QPainter *, painter, + // const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::drawForeground +// ----------------------------------------------------------------------------- +// +void QGraphicsView::drawForeground( + QPainter * painter, + const QRectF & rect ) + { + //SMC_MOCK_METHOD2( void, QPainter *, painter, + // const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsView::drawItems +// ----------------------------------------------------------------------------- +// +/* +void QGraphicsView::drawItems( + QPainter * painter, + int numItems, + QGraphicsItem * items, + const QStyleOptionGraphicsItem options ) + { + //SMC_MOCK_METHOD4( void, QPainter *, painter, + // int, numItems, + // QGraphicsItem *, items, + // const QStyleOptionGraphicsItem, options ) + } + +*/ diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtgui/mock_qgraphicswidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtgui/mock_qgraphicswidget.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,944 @@ +/** 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 +#include +#include +#include +#include +#include +#include +#include "qgraphicswidget.h" + +// ============================ MEMBER FUNCTIONS =============================== +// ----------------------------------------------------------------------------- +// QGraphicsWidget::QGraphicsWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget::QGraphicsWidget(QGraphicsItem *parent, Qt::WindowFlags wFlags) + : QGraphicsObject( parent ) +{ + +} + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::QGraphicsWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget::QGraphicsWidget( + QGraphicsWidgetPrivate &, + QGraphicsItem * parent, + QGraphicsScene *, + Qt::WindowFlags ) + : QGraphicsObject( parent ) + { + + } + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::~QGraphicsWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget::~QGraphicsWidget( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::layout +// ----------------------------------------------------------------------------- +// +QGraphicsLayout * QGraphicsWidget::layout( ) const + { + SMC_MOCK_METHOD0( QGraphicsLayout * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setLayout +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setLayout( + QGraphicsLayout * layout ) + { + SMC_MOCK_METHOD1( void, QGraphicsLayout *, layout ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::adjustSize +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::adjustSize( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::layoutDirection +// ----------------------------------------------------------------------------- +// +Qt::LayoutDirection QGraphicsWidget::layoutDirection( ) const + { + SMC_MOCK_METHOD0( Qt::LayoutDirection ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setLayoutDirection +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setLayoutDirection( + Qt::LayoutDirection direction ) + { + SMC_MOCK_METHOD1( void, Qt::LayoutDirection, direction ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::unsetLayoutDirection +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::unsetLayoutDirection( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::style +// ----------------------------------------------------------------------------- +// +QStyle * QGraphicsWidget::style( ) const + { + SMC_MOCK_METHOD0( QStyle * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setStyle +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setStyle( + QStyle * style ) + { + SMC_MOCK_METHOD1( void, QStyle *, style ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::font +// ----------------------------------------------------------------------------- +// +QFont QGraphicsWidget::font( ) const + { + SMC_MOCK_METHOD0( QFont ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setFont +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setFont( + const QFont & font ) + { + SMC_MOCK_METHOD1( void, const QFont &, font ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::palette +// ----------------------------------------------------------------------------- +// +QPalette QGraphicsWidget::palette( ) const + { + SMC_MOCK_METHOD0( QPalette ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setPalette +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setPalette( + const QPalette & palette ) + { + SMC_MOCK_METHOD1( void, const QPalette &, palette ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::autoFillBackground +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::autoFillBackground( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setAutoFillBackground +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setAutoFillBackground( + bool enabled ) + { + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::resize +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::resize( + const QSizeF & size ) + { + SMC_MOCK_METHOD1( void, const QSizeF &, size ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::size +// ----------------------------------------------------------------------------- +// +QSizeF QGraphicsWidget::size( ) const + { + SMC_MOCK_METHOD0( QSizeF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setGeometry +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setGeometry( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setContentsMargins +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setContentsMargins( + qreal left, + qreal top, + qreal right, + qreal bottom ) + { + SMC_MOCK_METHOD4( void, qreal, left, + qreal, top, + qreal, right, + qreal, bottom ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::getContentsMargins +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::getContentsMargins( + qreal * left, + qreal * top, + qreal * right, + qreal * bottom ) const + { + SMC_MOCK_METHOD4( void, qreal *, left, + qreal *, top, + qreal *, right, + qreal *, bottom ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setWindowFrameMargins +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setWindowFrameMargins( + qreal left, + qreal top, + qreal right, + qreal bottom ) + { + SMC_MOCK_METHOD4( void, qreal, left, + qreal, top, + qreal, right, + qreal, bottom ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::getWindowFrameMargins +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::getWindowFrameMargins( + qreal * left, + qreal * top, + qreal * right, + qreal * bottom ) const + { + SMC_MOCK_METHOD4( void, qreal *, left, + qreal *, top, + qreal *, right, + qreal *, bottom ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::unsetWindowFrameMargins +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::unsetWindowFrameMargins( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::windowFrameGeometry +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsWidget::windowFrameGeometry( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::windowFrameRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsWidget::windowFrameRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::windowFlags +// ----------------------------------------------------------------------------- +// +Qt::WindowFlags QGraphicsWidget::windowFlags( ) const + { + SMC_MOCK_METHOD0( Qt::WindowFlags ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::windowType +// ----------------------------------------------------------------------------- +// +Qt::WindowType QGraphicsWidget::windowType( ) const + { + SMC_MOCK_METHOD0( Qt::WindowType ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setWindowFlags +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setWindowFlags( + Qt::WindowFlags wFlags ) + { + SMC_MOCK_METHOD1( void, /*Qt::WindowFlags*/int, wFlags ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::isActiveWindow +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::isActiveWindow( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setWindowTitle +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setWindowTitle( + const QString & title ) + { + SMC_MOCK_METHOD1( void, const QString &, title ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::windowTitle +// ----------------------------------------------------------------------------- +// +QString QGraphicsWidget::windowTitle( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::focusPolicy +// ----------------------------------------------------------------------------- +// +Qt::FocusPolicy QGraphicsWidget::focusPolicy( ) const + { + SMC_MOCK_METHOD0( Qt::FocusPolicy ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setFocusPolicy +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setFocusPolicy( + Qt::FocusPolicy policy ) + { + SMC_MOCK_METHOD1( void, Qt::FocusPolicy, policy ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setTabOrder +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setTabOrder( + QGraphicsWidget * first, + QGraphicsWidget * second ) + { + SMC_MOCK_METHOD2( void, QGraphicsWidget *, first, + QGraphicsWidget *, second ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::focusWidget +// ----------------------------------------------------------------------------- +// +QGraphicsWidget * QGraphicsWidget::focusWidget( ) const + { + SMC_MOCK_METHOD0( QGraphicsWidget * ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::grabShortcut +// ----------------------------------------------------------------------------- +// +int QGraphicsWidget::grabShortcut( + const QKeySequence & s, + Qt::ShortcutContext c ) + { + SMC_MOCK_METHOD2( int, const QKeySequence &, s, + Qt::ShortcutContext, c ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::releaseShortcut +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::releaseShortcut( + int id ) + { + SMC_MOCK_METHOD1( void, int, id ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setShortcutEnabled +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setShortcutEnabled( + int id, + bool enabled ) + { + SMC_MOCK_METHOD2( void, int, id, + bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setShortcutAutoRepeat +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setShortcutAutoRepeat( + int id, + bool enabled ) + { + SMC_MOCK_METHOD2( void, int, id, + bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::addAction +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::addAction( + QAction * a ) + { + SMC_MOCK_METHOD1( void, QAction *, a ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::addActions +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::addActions( + QList actions ) + { + SMC_MOCK_METHOD1( void, QList, actions ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::insertAction +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::insertAction( + QAction * before, + QAction * a ) + { + SMC_MOCK_METHOD2( void, QAction *, before, + QAction *, a ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::insertActions +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::insertActions( + QAction * before, + QList actions ) + { + SMC_MOCK_METHOD2( void, QAction *, before, + QList, actions ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::removeAction +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::removeAction( + QAction * a ) + { + SMC_MOCK_METHOD1( void, QAction *, a ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::actions +// ----------------------------------------------------------------------------- +// +QList QGraphicsWidget::actions( ) const + { + SMC_MOCK_METHOD0( QList ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::setAttribute +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::setAttribute( + Qt::WidgetAttribute attribute, + bool on ) + { + SMC_MOCK_METHOD2( void, Qt::WidgetAttribute, attribute, + bool, on ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::testAttribute +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::testAttribute( + Qt::WidgetAttribute attribute ) const + { + SMC_MOCK_METHOD1( bool, Qt::WidgetAttribute, attribute ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::type +// ----------------------------------------------------------------------------- +// +int QGraphicsWidget::type( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::paint +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::paint( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::paintWindowFrame +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::paintWindowFrame( + QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget ) + { + SMC_MOCK_METHOD3( void, QPainter *, painter, + const QStyleOptionGraphicsItem *, option, + QWidget *, widget ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QGraphicsWidget::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::shape +// ----------------------------------------------------------------------------- +// +QPainterPath QGraphicsWidget::shape( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::layoutChanged +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::layoutChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::close +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::close( ) + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::initStyleOption +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::initStyleOption( + QStyleOption * option ) const + { + SMC_MOCK_METHOD1( void, QStyleOption *, option ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::sizeHint +// ----------------------------------------------------------------------------- +// +QSizeF QGraphicsWidget::sizeHint( + Qt::SizeHint which, + const QSizeF & constraint ) const + { + SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which, + const QSizeF &, constraint ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::updateGeometry +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::updateGeometry( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::itemChange +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsWidget::itemChange( + GraphicsItemChange change, + const QVariant & value ) + { + SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::propertyChange +// ----------------------------------------------------------------------------- +// +QVariant QGraphicsWidget::propertyChange( + const QString & propertyName, + const QVariant & value ) + { + SMC_MOCK_METHOD2( QVariant, const QString &, propertyName, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::sceneEvent +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::sceneEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::windowFrameEvent +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::windowFrameEvent( + QEvent * e ) + { + SMC_MOCK_METHOD1( bool, QEvent *, e ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::windowFrameSectionAt +// ----------------------------------------------------------------------------- +// +Qt::WindowFrameSection QGraphicsWidget::windowFrameSectionAt( + const QPointF & pos ) const + { + SMC_MOCK_METHOD1( Qt::WindowFrameSection, const QPointF &, pos ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::event +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::event( + QEvent * event ) + { + SMC_MOCK_METHOD1( bool, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::changeEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::changeEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::closeEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::closeEvent( + QCloseEvent * event ) + { + SMC_MOCK_METHOD1( void, QCloseEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::focusInEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::focusInEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::focusNextPrevChild +// ----------------------------------------------------------------------------- +// +bool QGraphicsWidget::focusNextPrevChild( + bool next ) + { + SMC_MOCK_METHOD1( bool, bool, next ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::focusOutEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::focusOutEvent( + QFocusEvent * event ) + { + SMC_MOCK_METHOD1( void, QFocusEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::hideEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::hideEvent( + QHideEvent * event ) + { + SMC_MOCK_METHOD1( void, QHideEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::moveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::moveEvent( + QGraphicsSceneMoveEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneMoveEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::polishEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::polishEvent( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::resizeEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::resizeEvent( + QGraphicsSceneResizeEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::showEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::showEvent( + QShowEvent * event ) + { + SMC_MOCK_METHOD1( void, QShowEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::hoverMoveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::hoverMoveEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::hoverLeaveEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::hoverLeaveEvent( + QGraphicsSceneHoverEvent * event ) + { + SMC_MOCK_METHOD1( void, QGraphicsSceneHoverEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::grabMouseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::grabMouseEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::ungrabMouseEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::ungrabMouseEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::grabKeyboardEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::grabKeyboardEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + +// ----------------------------------------------------------------------------- +// QGraphicsWidget::ungrabKeyboardEvent +// ----------------------------------------------------------------------------- +// +void QGraphicsWidget::ungrabKeyboardEvent( + QEvent * event ) + { + SMC_MOCK_METHOD1( void, QEvent *, event ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtgui/mock_qpainterpath.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtgui/mock_qpainterpath.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,929 @@ +/** 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 +#include +#include +#include +#include + +// NOTE! The following header include requires +// INCLUDEPATH += /epoc32/include/mw/QtGui/private +//#include +class QPainterPathStrokerPrivate {}; +class QPainterPathData : public QPainterPathPrivate {}; + +struct QPainterPathPrivateDeleter +{ + static inline void cleanup(QPainterPathPrivate *d) + { + // note - we must up-cast to QPainterPathData since QPainterPathPrivate + // has a non-virtual destructor! + if (d && !d->ref.deref()) + delete static_cast(d); + } +}; + + +// ============================ MEMBER FUNCTIONS =============================== + + +#ifndef QT_NO_DATASTREAM +// ----------------------------------------------------------------------------- +// QPainterPathPrivate::operator<< +// ----------------------------------------------------------------------------- +// +/*QDataStream & QPainterPathPrivate::operator<<( + QDataStream &, + const QPainterPath & ) + { + SMC_MOCK_METHOD2( QDataStream &, QDataStream, &, + const QPainterPath, & ) + }*/ + + +// ----------------------------------------------------------------------------- +// QPainterPathPrivate::operator>> +// ----------------------------------------------------------------------------- +// +/*QDataStream & QPainterPathPrivate::operator>>( + QDataStream &, + QPainterPath & ) + { + SMC_MOCK_METHOD2( QDataStream &, QDataStream, &, + QPainterPath, & ) + }*/ +#endif + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::~QPainterPathStroker +// ----------------------------------------------------------------------------- +// +QPainterPathStroker::~QPainterPathStroker( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setWidth +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setWidth( + qreal width ) + { + SMC_MOCK_METHOD1( void, qreal, width ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::width +// ----------------------------------------------------------------------------- +// +qreal QPainterPathStroker::width( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setCapStyle +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setCapStyle( + Qt::PenCapStyle style ) + { + SMC_MOCK_METHOD1( void, Qt::PenCapStyle, style ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::capStyle +// ----------------------------------------------------------------------------- +// +Qt::PenCapStyle QPainterPathStroker::capStyle( ) const + { + SMC_MOCK_METHOD0( Qt::PenCapStyle ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setJoinStyle +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setJoinStyle( + Qt::PenJoinStyle style ) + { + SMC_MOCK_METHOD1( void, Qt::PenJoinStyle, style ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::joinStyle +// ----------------------------------------------------------------------------- +// +Qt::PenJoinStyle QPainterPathStroker::joinStyle( ) const + { + SMC_MOCK_METHOD0( Qt::PenJoinStyle ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setMiterLimit +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setMiterLimit( + qreal length ) + { + SMC_MOCK_METHOD1( void, qreal, length ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::miterLimit +// ----------------------------------------------------------------------------- +// +qreal QPainterPathStroker::miterLimit( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setCurveThreshold +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setCurveThreshold( + qreal threshold ) + { + SMC_MOCK_METHOD1( void, qreal, threshold ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::curveThreshold +// ----------------------------------------------------------------------------- +// +qreal QPainterPathStroker::curveThreshold( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setDashPattern +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setDashPattern( + Qt::PenStyle style ) + { + SMC_MOCK_METHOD1( void, Qt::PenStyle, style ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setDashPattern +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setDashPattern( + const QVector & dashPattern ) + { + SMC_MOCK_METHOD1( void, const QVector &, dashPattern ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::dashPattern +// ----------------------------------------------------------------------------- +// +QVector QPainterPathStroker::dashPattern( ) const + { + SMC_MOCK_METHOD0( QVector ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::setDashOffset +// ----------------------------------------------------------------------------- +// +void QPainterPathStroker::setDashOffset( + qreal offset ) + { + SMC_MOCK_METHOD1( void, qreal, offset ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::dashOffset +// ----------------------------------------------------------------------------- +// +qreal QPainterPathStroker::dashOffset( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPathStroker::createStroke +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPathStroker::createStroke( + const QPainterPath & path ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::QPainterPath +// ----------------------------------------------------------------------------- +// +QPainterPath::QPainterPath( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::QPainterPath +// ----------------------------------------------------------------------------- +// +QPainterPath::QPainterPath( + const QPointF & startPoint ) + { + + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::QPainterPath +// ----------------------------------------------------------------------------- +// +QPainterPath::QPainterPath( + const QPainterPath & other ) + { + + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator= +// ----------------------------------------------------------------------------- +// +QPainterPath & QPainterPath::operator=( + const QPainterPath & other ) + { + SMC_MOCK_METHOD1( QPainterPath &, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::~QPainterPath +// ----------------------------------------------------------------------------- +// +QPainterPath::~QPainterPath( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::closeSubpath +// ----------------------------------------------------------------------------- +// +void QPainterPath::closeSubpath( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::moveTo +// ----------------------------------------------------------------------------- +// +void QPainterPath::moveTo( + const QPointF & p ) + { + SMC_MOCK_METHOD1( void, const QPointF &, p ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::lineTo +// ----------------------------------------------------------------------------- +// +void QPainterPath::lineTo( + const QPointF & p ) + { + SMC_MOCK_METHOD1( void, const QPointF &, p ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::arcMoveTo +// ----------------------------------------------------------------------------- +// +void QPainterPath::arcMoveTo( + const QRectF & rect, + qreal angle ) + { + SMC_MOCK_METHOD2( void, const QRectF &, rect, + qreal, angle ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::arcTo +// ----------------------------------------------------------------------------- +// +void QPainterPath::arcTo( + const QRectF & rect, + qreal startAngle, + qreal arcLength ) + { + SMC_MOCK_METHOD3( void, const QRectF &, rect, + qreal, startAngle, + qreal, arcLength ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::cubicTo +// ----------------------------------------------------------------------------- +// +void QPainterPath::cubicTo( + const QPointF & ctrlPt1, + const QPointF & ctrlPt2, + const QPointF & endPt ) + { + SMC_MOCK_METHOD3( void, const QPointF &, ctrlPt1, + const QPointF &, ctrlPt2, + const QPointF &, endPt ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::quadTo +// ----------------------------------------------------------------------------- +// +void QPainterPath::quadTo( + const QPointF & ctrlPt, + const QPointF & endPt ) + { + SMC_MOCK_METHOD2( void, const QPointF &, ctrlPt, + const QPointF &, endPt ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::currentPosition +// ----------------------------------------------------------------------------- +// +QPointF QPainterPath::currentPosition( ) const + { + SMC_MOCK_METHOD0( QPointF ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addRect +// ----------------------------------------------------------------------------- +// +void QPainterPath::addRect( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addEllipse +// ----------------------------------------------------------------------------- +// +void QPainterPath::addEllipse( + const QRectF & rect ) + { + SMC_MOCK_METHOD1( void, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addPolygon +// ----------------------------------------------------------------------------- +// +void QPainterPath::addPolygon( + const QPolygonF & polygon ) + { + SMC_MOCK_METHOD1( void, const QPolygonF &, polygon ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addText +// ----------------------------------------------------------------------------- +// +void QPainterPath::addText( + const QPointF & point, + const QFont & f, + const QString & text ) + { + SMC_MOCK_METHOD3( void, const QPointF &, point, + const QFont &, f, + const QString &, text ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addPath +// ----------------------------------------------------------------------------- +// +void QPainterPath::addPath( + const QPainterPath & path ) + { + SMC_MOCK_METHOD1( void, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addRegion +// ----------------------------------------------------------------------------- +// +void QPainterPath::addRegion( + const QRegion & region ) + { + SMC_MOCK_METHOD1( void, const QRegion &, region ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addRoundedRect +// ----------------------------------------------------------------------------- +// +void QPainterPath::addRoundedRect( + const QRectF & rect, + qreal xRadius, + qreal yRadius, + Qt::SizeMode mode ) + { + SMC_MOCK_METHOD4( void, const QRectF &, rect, + qreal, xRadius, + qreal, yRadius, + Qt::SizeMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::addRoundRect +// ----------------------------------------------------------------------------- +// +void QPainterPath::addRoundRect( + const QRectF & rect, + int xRnd, + int yRnd ) + { + SMC_MOCK_METHOD3( void, const QRectF &, rect, + int, xRnd, + int, yRnd ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::connectPath +// ----------------------------------------------------------------------------- +// +void QPainterPath::connectPath( + const QPainterPath & path ) + { + SMC_MOCK_METHOD1( void, const QPainterPath &, path ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::contains +// ----------------------------------------------------------------------------- +// +bool QPainterPath::contains( + const QPointF & pt ) const + { + SMC_MOCK_METHOD1( bool, const QPointF &, pt ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::contains +// ----------------------------------------------------------------------------- +// +bool QPainterPath::contains( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( bool, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::intersects +// ----------------------------------------------------------------------------- +// +bool QPainterPath::intersects( + const QRectF & rect ) const + { + SMC_MOCK_METHOD1( bool, const QRectF &, rect ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::translate +// ----------------------------------------------------------------------------- +// +void QPainterPath::translate( + qreal dx, + qreal dy ) + { + SMC_MOCK_METHOD2( void, qreal, dx, + qreal, dy ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::translated +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::translated( + qreal dx, + qreal dy ) const + { + SMC_MOCK_METHOD2( QPainterPath, qreal, dx, + qreal, dy ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::boundingRect +// ----------------------------------------------------------------------------- +// +QRectF QPainterPath::boundingRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::controlPointRect +// ----------------------------------------------------------------------------- +// +QRectF QPainterPath::controlPointRect( ) const + { + SMC_MOCK_METHOD0( QRectF ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::fillRule +// ----------------------------------------------------------------------------- +// +Qt::FillRule QPainterPath::fillRule( ) const + { + SMC_MOCK_METHOD0( Qt::FillRule ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::setFillRule +// ----------------------------------------------------------------------------- +// +void QPainterPath::setFillRule( + Qt::FillRule fillRule ) + { + SMC_MOCK_METHOD1( void, Qt::FillRule, fillRule ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::toReversed +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::toReversed( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::toSubpathPolygons +// ----------------------------------------------------------------------------- +// +QList QPainterPath::toSubpathPolygons( + const QMatrix & matrix ) const + { + SMC_MOCK_METHOD1( QList , const QMatrix &, matrix ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::toFillPolygons +// ----------------------------------------------------------------------------- +// +QList QPainterPath::toFillPolygons( + const QMatrix & matrix ) const + { + SMC_MOCK_METHOD1( QList , const QMatrix &, matrix ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::toFillPolygon +// ----------------------------------------------------------------------------- +// +QPolygonF QPainterPath::toFillPolygon( + const QMatrix & matrix ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QMatrix &, matrix ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::toSubpathPolygons +// ----------------------------------------------------------------------------- +// +QList QPainterPath::toSubpathPolygons( + const QTransform & matrix ) const + { + SMC_MOCK_METHOD1( QList , const QTransform &, matrix ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::toFillPolygons +// ----------------------------------------------------------------------------- +// +QList QPainterPath::toFillPolygons( + const QTransform & matrix ) const + { + SMC_MOCK_METHOD1( QList , const QTransform &, matrix ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::toFillPolygon +// ----------------------------------------------------------------------------- +// +QPolygonF QPainterPath::toFillPolygon( + const QTransform & matrix ) const + { + SMC_MOCK_METHOD1( QPolygonF, const QTransform &, matrix ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::length +// ----------------------------------------------------------------------------- +// +qreal QPainterPath::length( ) const + { + SMC_MOCK_METHOD0( qreal ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::percentAtLength +// ----------------------------------------------------------------------------- +// +qreal QPainterPath::percentAtLength( + qreal t ) const + { + SMC_MOCK_METHOD1( qreal, qreal, t ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::pointAtPercent +// ----------------------------------------------------------------------------- +// +QPointF QPainterPath::pointAtPercent( + qreal t ) const + { + SMC_MOCK_METHOD1( QPointF, qreal, t ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::angleAtPercent +// ----------------------------------------------------------------------------- +// +qreal QPainterPath::angleAtPercent( + qreal t ) const + { + SMC_MOCK_METHOD1( qreal, qreal, t ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::slopeAtPercent +// ----------------------------------------------------------------------------- +// +qreal QPainterPath::slopeAtPercent( + qreal t ) const + { + SMC_MOCK_METHOD1( qreal, qreal, t ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::intersects +// ----------------------------------------------------------------------------- +// +bool QPainterPath::intersects( + const QPainterPath & p ) const + { + SMC_MOCK_METHOD1( bool, const QPainterPath &, p ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::contains +// ----------------------------------------------------------------------------- +// +bool QPainterPath::contains( + const QPainterPath & p ) const + { + SMC_MOCK_METHOD1( bool, const QPainterPath &, p ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::united +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::united( + const QPainterPath & r ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, r ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::intersected +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::intersected( + const QPainterPath & r ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, r ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::subtracted +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::subtracted( + const QPainterPath & r ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, r ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::subtractedInverted +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::subtractedInverted( + const QPainterPath & r ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, r ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::simplified +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::simplified( ) const + { + SMC_MOCK_METHOD0( QPainterPath ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator== +// ----------------------------------------------------------------------------- +// +bool QPainterPath::operator==( + const QPainterPath & other ) const + { + SMC_MOCK_METHOD1( bool, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator!= +// ----------------------------------------------------------------------------- +// +bool QPainterPath::operator!=( + const QPainterPath & other ) const + { + SMC_MOCK_METHOD1( bool, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator& +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::operator&( + const QPainterPath & other ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator| +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::operator|( + const QPainterPath & other ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator+ +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::operator+( + const QPainterPath & other ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator- +// ----------------------------------------------------------------------------- +// +QPainterPath QPainterPath::operator-( + const QPainterPath & other ) const + { + SMC_MOCK_METHOD1( QPainterPath, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator&= +// ----------------------------------------------------------------------------- +// +QPainterPath & QPainterPath::operator&=( + const QPainterPath & other ) + { + SMC_MOCK_METHOD1( QPainterPath &, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator= +// ----------------------------------------------------------------------------- +// +/*QPainterPath & QPainterPath::operator=( + const QPainterPath & other ) + { + SMC_MOCK_METHOD1( QPainterPath &, const QPainterPath &, other ) + }*/ + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator+= +// ----------------------------------------------------------------------------- +// +QPainterPath & QPainterPath::operator+=( + const QPainterPath & other ) + { + SMC_MOCK_METHOD1( QPainterPath &, const QPainterPath &, other ) + } + + +// ----------------------------------------------------------------------------- +// QPainterPath::operator-= +// ----------------------------------------------------------------------------- +// +QPainterPath & QPainterPath::operator-=( + const QPainterPath & other ) + { + SMC_MOCK_METHOD1( QPainterPath &, const QPainterPath &, other ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qthighway/mock_xqaiwinterfacedescriptor.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qthighway/mock_xqaiwinterfacedescriptor.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,179 @@ +/** 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 +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::XQAiwInterfaceDescriptor +// ----------------------------------------------------------------------------- +// +XQAiwInterfaceDescriptor::XQAiwInterfaceDescriptor( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::XQAiwInterfaceDescriptor +// ----------------------------------------------------------------------------- +// +XQAiwInterfaceDescriptor::XQAiwInterfaceDescriptor( + const XQAiwInterfaceDescriptor & other ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::~XQAiwInterfaceDescriptor +// ----------------------------------------------------------------------------- +// +XQAiwInterfaceDescriptor::~XQAiwInterfaceDescriptor( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::= +// ----------------------------------------------------------------------------- +// +XQAiwInterfaceDescriptor & XQAiwInterfaceDescriptor::operator=( + const XQAiwInterfaceDescriptor & other ) + { + SMC_MOCK_METHOD1( XQAiwInterfaceDescriptor &, const XQAiwInterfaceDescriptor &, other ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::= +// ----------------------------------------------------------------------------- +// +bool XQAiwInterfaceDescriptor::operator==( + const XQAiwInterfaceDescriptor & other ) const + { + SMC_MOCK_METHOD1( bool, const XQAiwInterfaceDescriptor &, other ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::serviceName +// ----------------------------------------------------------------------------- +// +QString XQAiwInterfaceDescriptor::serviceName( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::interfaceName +// ----------------------------------------------------------------------------- +// +QString XQAiwInterfaceDescriptor::interfaceName( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::majorVersion +// ----------------------------------------------------------------------------- +// +int XQAiwInterfaceDescriptor::majorVersion( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::minorVersion +// ----------------------------------------------------------------------------- +// +int XQAiwInterfaceDescriptor::minorVersion( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::isValid +// ----------------------------------------------------------------------------- +// +bool XQAiwInterfaceDescriptor::isValid( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::inSystemScope +// ----------------------------------------------------------------------------- +// +bool XQAiwInterfaceDescriptor::inSystemScope( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::property +// ----------------------------------------------------------------------------- +// +QVariant XQAiwInterfaceDescriptor::property( + XQAiwInterfaceDescriptor::PropertyKey key ) const + { + SMC_MOCK_METHOD1( QVariant, XQAiwInterfaceDescriptor::PropertyKey, key ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::customProperty +// ----------------------------------------------------------------------------- +// +QString XQAiwInterfaceDescriptor::customProperty( + const QString & key ) const + { + SMC_MOCK_METHOD1( QString, const QString &, key ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::customPropertyKeys +// ----------------------------------------------------------------------------- +// +QStringList XQAiwInterfaceDescriptor::customPropertyKeys( ) const + { + SMC_MOCK_METHOD0( QStringList ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwInterfaceDescriptor::setProperty +// ----------------------------------------------------------------------------- +// +bool XQAiwInterfaceDescriptor::setProperty( + XQAiwInterfaceDescriptor::PropertyKey key, + const QVariant value ) + { + SMC_MOCK_METHOD2( bool, XQAiwInterfaceDescriptor::PropertyKey, key, + const QVariant, value ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qthighway/mock_xqaiwrequest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qthighway/mock_xqaiwrequest.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,318 @@ +/* +* 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 +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// XQAiwRequest::XQAiwRequest +// ----------------------------------------------------------------------------- +// +XQAiwRequest::XQAiwRequest( + const XQAiwInterfaceDescriptor & descriptor, + const QString & operation, + bool embedded ) + //: + //QObject( /*descriptor, operation, embedded*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::XQAiwRequest +// ----------------------------------------------------------------------------- +// +XQAiwRequest::XQAiwRequest( + const QUrl & uri, + const XQAiwInterfaceDescriptor & descriptor, + const QString & operation ) + //: + //QObject( /*uri, descriptor, operation*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::XQAiwRequest +// ----------------------------------------------------------------------------- +// +XQAiwRequest::XQAiwRequest( + const QFile & file, + const XQAiwInterfaceDescriptor & descriptor, + const QString & operation ) + //: + //QObject( /*file, descriptor, operation*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::XQAiwRequest +// ----------------------------------------------------------------------------- +// +XQAiwRequest::XQAiwRequest( + const XQSharableFile & file, + const XQAiwInterfaceDescriptor & descriptor, + const QString & operation ) + //: + //QObject( /*file, descriptor, operation*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::~XQAiwRequest +// ----------------------------------------------------------------------------- +// +XQAiwRequest::~XQAiwRequest( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::createAction +// ----------------------------------------------------------------------------- +// +QAction * XQAiwRequest::createAction( ) + { + SMC_MOCK_METHOD0( QAction * ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::setArguments +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::setArguments( + const QList & arguments ) + { + //SMC_MOCK_METHOD1( void, const QList &, arguments ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::lastError +// ----------------------------------------------------------------------------- +// +int XQAiwRequest::lastError( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::lastErrorMessage +// ----------------------------------------------------------------------------- +// +const QString & XQAiwRequest::lastErrorMessage( ) const + { + SMC_MOCK_METHOD0( const QString & ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::descriptor +// ----------------------------------------------------------------------------- +// +const XQAiwInterfaceDescriptor & XQAiwRequest::descriptor( ) const + { + //SMC_MOCK_METHOD0( const XQAiwInterfaceDescriptor & ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::send +// ----------------------------------------------------------------------------- +// +bool XQAiwRequest::send( ) + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::send +// ----------------------------------------------------------------------------- +// +bool XQAiwRequest::send( + QVariant & returnValue ) + { + //SMC_MOCK_METHOD1( bool, QVariant &, returnValue ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::setEmbedded +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::setEmbedded( + bool embedded ) + { + SMC_MOCK_METHOD1( void, bool, embedded ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::isEmbedded +// ----------------------------------------------------------------------------- +// +bool XQAiwRequest::isEmbedded( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::setOperation +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::setOperation( + const QString & operation ) + { + SMC_MOCK_METHOD1( void, const QString &, operation ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::operation +// ----------------------------------------------------------------------------- +// +const QString & XQAiwRequest::operation( ) const + { + SMC_MOCK_METHOD0( const QString & ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::setSynchronous +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::setSynchronous( + bool synchronous ) + { + SMC_MOCK_METHOD1( void, bool, synchronous ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::isSynchronous +// ----------------------------------------------------------------------------- +// +bool XQAiwRequest::isSynchronous( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::setBackground +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::setBackground( + bool background ) + { + SMC_MOCK_METHOD1( void, bool, background ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::isBackground +// ----------------------------------------------------------------------------- +// +bool XQAiwRequest::isBackground( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::setInfo +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::setInfo( + const XQRequestInfo & info ) + { + // SMC_MOCK_METHOD1( void, const XQRequestInfo &, info ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::info +// ----------------------------------------------------------------------------- +// +XQRequestInfo XQAiwRequest::info( ) const + { + //SMC_MOCK_METHOD0( XQRequestInfo ) + } + + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::results +// ----------------------------------------------------------------------------- +// +const QVariant & XQAiwRequest::results( ) const + { + //SMC_MOCK_METHOD0( const QVariant & ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::sendExecute +// ----------------------------------------------------------------------------- +// +bool XQAiwRequest::sendExecute( ) + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::handleAsyncResponse +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::handleAsyncResponse(const QVariant& value) +{ + SMC_MOCK_METHOD1( void, const QVariant &, value ) +} + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::sendFromAction +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::sendFromAction(bool checked) +{ + SMC_MOCK_METHOD1( void, bool, checked ) +} + + +// ----------------------------------------------------------------------------- +// XQAiwRequest::handleAsyncError +// ----------------------------------------------------------------------------- +// +void XQAiwRequest::handleAsyncError(int err) +{ + SMC_MOCK_METHOD1( void, int, err ) +} diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qthighway/mock_xqappmgr.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qthighway/mock_xqappmgr.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,297 @@ +/* +* 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 +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// XQApplicationManager::XQApplicationManager +// ----------------------------------------------------------------------------- +// +XQApplicationManager::XQApplicationManager( ) + //: + //QObject( /**/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::~XQApplicationManager +// ----------------------------------------------------------------------------- +// +XQApplicationManager::~XQApplicationManager( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const QString & interface, + const QString & operation, + bool embedded ) + { + SMC_MOCK_METHOD3( XQAiwRequest *, const QString &, interface, + const QString &, operation, + bool, embedded ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const XQAiwInterfaceDescriptor & implementation, + const QString & operation, + bool embedded ) + { + SMC_MOCK_METHOD3( XQAiwRequest *, const XQAiwInterfaceDescriptor &, implementation, + const QString &, operation, + bool, embedded ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const QString & service, + const QString & interface, + const QString & operation, + bool embedded ) + { + SMC_MOCK_METHOD4( XQAiwRequest *, const QString &, service, + const QString &, interface, + const QString &, operation, + bool, embedded ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::list +// ----------------------------------------------------------------------------- +// +QList XQApplicationManager::list( + const QString & interface, + const QString & operation ) + { + /* SMC_MOCK_METHOD2( QList , const QString &, interface, + const QString &, operation )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::list +// ----------------------------------------------------------------------------- +// +QList XQApplicationManager::list( + const QString & service, + const QString & interface, + const QString & operation ) + { + /*SMC_MOCK_METHOD3( QList , const QString &, service, + const QString &, interface, + const QString &, operation )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const QUrl & url, + bool embedded ) + { + /*SMC_MOCK_METHOD2( XQAiwRequest *, const QUrl &, url, + bool, embedded )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const QUrl & url, + const XQAiwInterfaceDescriptor & implementation, + bool embedded ) + { + /*SMC_MOCK_METHOD3( XQAiwRequest *, const QUrl &, url, + const XQAiwInterfaceDescriptor &, implementation, + bool, embedded )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const QFile & file, + bool embedded ) + { + /*SMC_MOCK_METHOD2( XQAiwRequest *, const QFile &, file, + bool, embedded )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const QFile & file, + const XQAiwInterfaceDescriptor & implementation, + bool embedded ) + { + /*SMC_MOCK_METHOD3( XQAiwRequest *, const QFile &, file, + const XQAiwInterfaceDescriptor &, implementation, + bool, embedded )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::list +// ----------------------------------------------------------------------------- +// +QList XQApplicationManager::list( + const QUrl & uri ) + { + //SMC_MOCK_METHOD1( QList , const QUrl &, uri ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::list +// ----------------------------------------------------------------------------- +// +QList XQApplicationManager::list( + const QFile & file ) + { + //SMC_MOCK_METHOD1( QList , const QFile &, file ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::list +// ----------------------------------------------------------------------------- +// +QList XQApplicationManager::list( + const XQSharableFile & file ) + { + //SMC_MOCK_METHOD1( QList , const XQSharableFile &, file ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const XQSharableFile & file, + bool embedded ) + { + /* SMC_MOCK_METHOD2( XQAiwRequest *, const XQSharableFile &, file, + bool, embedded )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::create +// ----------------------------------------------------------------------------- +// +XQAiwRequest * XQApplicationManager::create( + const XQSharableFile & file, + const XQAiwInterfaceDescriptor & implementation, + bool embedded ) + { + /*SMC_MOCK_METHOD3( XQAiwRequest *, const XQSharableFile &, file, + const XQAiwInterfaceDescriptor &, implementation, + bool, embedded )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::lastError +// ----------------------------------------------------------------------------- +// +int XQApplicationManager::lastError( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::isRunning +// ----------------------------------------------------------------------------- +// +bool XQApplicationManager::isRunning( + const XQAiwInterfaceDescriptor & implementation ) const + { + // SMC_MOCK_METHOD1( bool, const XQAiwInterfaceDescriptor &, implementation ) + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::getDrmAttributes +// ----------------------------------------------------------------------------- +// +bool XQApplicationManager::getDrmAttributes( + const QFile & file, + const QList & attributeNames, + QVariantList & attributeValues ) + { + /* SMC_MOCK_METHOD3( bool, const QFile &, file, + const QList &, attributeNames, + QVariantList &, attributeValues )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::getDrmAttributes +// ----------------------------------------------------------------------------- +// +bool XQApplicationManager::getDrmAttributes( + const XQSharableFile & file, + const QList & attributeNames, + QVariantList & attributeValues ) + { + /* SMC_MOCK_METHOD3( bool, const XQSharableFile &, file, + const QList &, attributeNames, + QVariantList &, attributeValues )*/ + } + + +// ----------------------------------------------------------------------------- +// XQApplicationManager::status +// ----------------------------------------------------------------------------- +// +XQApplicationManager::ServiceStatus XQApplicationManager::status( + const XQAiwInterfaceDescriptor & implementation ) + { + // SMC_MOCK_METHOD1( XQApplicationManager::ServiceStatus, const XQAiwInterfaceDescriptor &, implementation ) + } diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qthighway/mock_xqrequestinfo.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qthighway/mock_xqrequestinfo.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,220 @@ +/** 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 +#include +#include "xqrequestinfo.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// XQRequestInfo::XQRequestInfo +// ----------------------------------------------------------------------------- +// +XQRequestInfo::XQRequestInfo( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::~XQRequestInfo +// ----------------------------------------------------------------------------- +// +XQRequestInfo::~XQRequestInfo( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::isValid +// ----------------------------------------------------------------------------- +// +bool XQRequestInfo::isValid( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::setEmbedded +// ----------------------------------------------------------------------------- +// +void XQRequestInfo::setEmbedded( + bool on ) + { + SMC_MOCK_METHOD1( void, bool, on ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::isEmbedded +// ----------------------------------------------------------------------------- +// +bool XQRequestInfo::isEmbedded( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::setBackground +// ----------------------------------------------------------------------------- +// +void XQRequestInfo::setBackground( + bool on ) + { + SMC_MOCK_METHOD1( void, bool, on ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::isBackground +// ----------------------------------------------------------------------------- +// +bool XQRequestInfo::isBackground( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::isSynchronous +// ----------------------------------------------------------------------------- +// +bool XQRequestInfo::isSynchronous( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::setForeground +// ----------------------------------------------------------------------------- +// +void XQRequestInfo::setForeground( + bool on ) + { + SMC_MOCK_METHOD1( void, bool, on ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::isForeground +// ----------------------------------------------------------------------------- +// +bool XQRequestInfo::isForeground( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::clientSecureId +// ----------------------------------------------------------------------------- +// +quint32 XQRequestInfo::clientSecureId( ) const + { + SMC_MOCK_METHOD0( quint32 ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::clientVendorId +// ----------------------------------------------------------------------------- +// +quint32 XQRequestInfo::clientVendorId( ) const + { + SMC_MOCK_METHOD0( quint32 ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::clientCapabilities +// ----------------------------------------------------------------------------- +// +QSet XQRequestInfo::clientCapabilities( ) const + { + SMC_MOCK_METHOD0( QSet ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::id +// ----------------------------------------------------------------------------- +// +int XQRequestInfo::id( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::setInfo +// ----------------------------------------------------------------------------- +// +void XQRequestInfo::setInfo( + const QString & key, + const QVariant & value ) + { + SMC_MOCK_METHOD2( void, const QString &, key, + const QVariant &, value ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::info +// ----------------------------------------------------------------------------- +// +QVariant XQRequestInfo::info( + const QString & key ) const + { + SMC_MOCK_METHOD1( QVariant, const QString &, key ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::infoKeys +// ----------------------------------------------------------------------------- +// +QStringList XQRequestInfo::infoKeys( ) const + { + SMC_MOCK_METHOD0( QStringList ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::serialize +// ----------------------------------------------------------------------------- +// +template void XQRequestInfo::serialize( + Stream & stream ) const + { + SMC_MOCK_METHOD1( template void, Stream &, stream ) + } + + +// ----------------------------------------------------------------------------- +// XQRequestInfo::deserialize +// ----------------------------------------------------------------------------- +// +template void XQRequestInfo::deserialize( + Stream & stream ) + { + SMC_MOCK_METHOD1( template void, Stream &, stream ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qthighway/mock_xqservicerequest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qthighway/mock_xqservicerequest.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,330 @@ +/** 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 +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// XQServiceRequest::XQServiceRequest +// ----------------------------------------------------------------------------- +// +XQServiceRequest::XQServiceRequest( ) + //: + //QObject( /**/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::XQServiceRequest +// ----------------------------------------------------------------------------- +// +XQServiceRequest::XQServiceRequest( + const QString & fullServiceName, + const QString & message, + const bool & synchronous ) + //: + //QObject( /*fullServiceName, message, synchronous*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::XQServiceRequest +// ----------------------------------------------------------------------------- +// +XQServiceRequest::XQServiceRequest( + const XQServiceRequest & orig ) + //: + //QObject( /*orig*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::XQServiceRequest +// ----------------------------------------------------------------------------- +// +XQServiceRequest::XQServiceRequest( + const XQAiwInterfaceDescriptor & descriptor, + const QString & message, + const bool & synchronous ) + //: + //QObject( /*descriptor, message, synchronous*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::~XQServiceRequest +// ----------------------------------------------------------------------------- +// +XQServiceRequest::~XQServiceRequest( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::send +// ----------------------------------------------------------------------------- +// +bool XQServiceRequest::send( ) + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::send +// ----------------------------------------------------------------------------- +// +bool XQServiceRequest::send( + QVariant & retValue ) + { + SMC_MOCK_METHOD1( bool, QVariant &, retValue ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::isNull +// ----------------------------------------------------------------------------- +// +bool XQServiceRequest::isNull( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::setSynchronous +// ----------------------------------------------------------------------------- +// +void XQServiceRequest::setSynchronous( + const bool & synchronous ) + { + SMC_MOCK_METHOD1( void, const bool &, synchronous ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::isSynchronous +// ----------------------------------------------------------------------------- +// +bool XQServiceRequest::isSynchronous( ) const + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::setService +// ----------------------------------------------------------------------------- +// +void XQServiceRequest::setService( + const QString & fullServiceName ) + { + SMC_MOCK_METHOD1( void, const QString &, fullServiceName ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::service +// ----------------------------------------------------------------------------- +// +QString XQServiceRequest::service( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::setMessage +// ----------------------------------------------------------------------------- +// +void XQServiceRequest::setMessage( + const QString & message ) + { + SMC_MOCK_METHOD1( void, const QString &, message ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::message +// ----------------------------------------------------------------------------- +// +QString XQServiceRequest::message( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::arguments +// ----------------------------------------------------------------------------- +// +const QList & XQServiceRequest::arguments( ) const + { + SMC_MOCK_METHOD0( const QList & ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::setArguments +// ----------------------------------------------------------------------------- +// +void XQServiceRequest::setArguments( + const QList & arguments ) + { + SMC_MOCK_METHOD1( void, const QList &, arguments ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::latestError +// ----------------------------------------------------------------------------- +// +int XQServiceRequest::latestError( ) + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::setInfo +// ----------------------------------------------------------------------------- +// +void XQServiceRequest::setInfo( + const XQRequestInfo & reqInfo ) + { + SMC_MOCK_METHOD1( void, const XQRequestInfo &, reqInfo ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::info +// ----------------------------------------------------------------------------- +// +XQRequestInfo XQServiceRequest::info( ) const + { + SMC_MOCK_METHOD0( XQRequestInfo ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::= +// ----------------------------------------------------------------------------- +// +XQServiceRequest & XQServiceRequest::operator=( + const XQServiceRequest & orig ) + { + SMC_MOCK_METHOD1( XQServiceRequest &, const XQServiceRequest &, orig ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::serializeArguments +// ----------------------------------------------------------------------------- +// +QByteArray XQServiceRequest::serializeArguments( + const XQServiceRequest & actione ) + { + SMC_MOCK_METHOD1( QByteArray, const XQServiceRequest &, actione ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::deserializeArguments +// ----------------------------------------------------------------------------- +// +void XQServiceRequest::deserializeArguments( + XQServiceRequest & actione, + const QByteArray & data ) + { + SMC_MOCK_METHOD2( void, XQServiceRequest &, actione, + const QByteArray &, data ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::serialize +// ----------------------------------------------------------------------------- +// +template void XQServiceRequest::serialize( + Stream & stream ) const + { + SMC_MOCK_METHOD1( template void, Stream &, stream ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::deserialize +// ----------------------------------------------------------------------------- +// +template void XQServiceRequest::deserialize( + Stream & stream ) + { + SMC_MOCK_METHOD1( template void, Stream &, stream ) + } + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::requestCompleted +// ----------------------------------------------------------------------------- +// +/*void XQServiceRequest::requestCompleted( + const QVariant & value ) + { + SMC_MOCK_METHOD1( void, const QVariant &, value ) + }*/ + + +// ----------------------------------------------------------------------------- +// XQServiceRequest::requestError +// ----------------------------------------------------------------------------- +// +/*void XQServiceRequest::requestError( + int err ) + { + SMC_MOCK_METHOD1( void, int, err ) + }*/ + +// ----------------------------------------------------------------------------- +// XQServiceRequest::addArg +// ----------------------------------------------------------------------------- +// +void XQServiceRequest::addArg( + const QVariant& v) + { + SMC_MOCK_METHOD1( void, const QVariant&, v ) + } + +// ----------------------------------------------------------------------------- +// XQServiceRequest::handleSharableFileArgs +// ----------------------------------------------------------------------------- +// +bool XQServiceRequest::handleSharableFileArgs() + { + SMC_MOCK_METHOD0( bool ); + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtmobility/mock_qsysteminfo.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtmobility/mock_qsysteminfo.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,611 @@ +/* +* 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +QTM_BEGIN_NAMESPACE + + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// QSystemStorageInfo::QSystemStorageInfo +// ----------------------------------------------------------------------------- +// +QSystemStorageInfo::QSystemStorageInfo( QObject * parent ) + : QObject(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemStorageInfo::~QSystemStorageInfo +// ----------------------------------------------------------------------------- +// +QSystemStorageInfo::~QSystemStorageInfo( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemStorageInfo::totalDiskSpace +// ----------------------------------------------------------------------------- +// +Q_INVOKABLE qlonglong QSystemStorageInfo::totalDiskSpace( + const QString & driveVolume ) + { + SMC_MOCK_METHOD1( Q_INVOKABLE qlonglong, const QString &, driveVolume ) + } + + +// ----------------------------------------------------------------------------- +// QSystemStorageInfo::availableDiskSpace +// ----------------------------------------------------------------------------- +// +Q_INVOKABLE qlonglong QSystemStorageInfo::availableDiskSpace( + const QString & driveVolume ) + { + SMC_MOCK_METHOD1( Q_INVOKABLE qlonglong, const QString &, driveVolume ) + } + + +// ----------------------------------------------------------------------------- +// QSystemStorageInfo::logicalDrives +// ----------------------------------------------------------------------------- +// +QStringList QSystemStorageInfo::logicalDrives( ) + { + SMC_MOCK_METHOD0( QStringList ) + } + + +// ----------------------------------------------------------------------------- +// QSystemStorageInfo::typeForDrive +// ----------------------------------------------------------------------------- +// +Q_INVOKABLE QSystemStorageInfo::DriveType QSystemStorageInfo::typeForDrive( + const QString & driveVolume ) + { + SMC_MOCK_METHOD1( Q_INVOKABLE QSystemStorageInfo::DriveType, const QString &, driveVolume ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::QSystemDeviceInfo +// ----------------------------------------------------------------------------- +// +QSystemDeviceInfo::QSystemDeviceInfo ( QObject * parent ) + : QObject(parent) + { + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::~QSystemDeviceInfo +// ----------------------------------------------------------------------------- +// +QSystemDeviceInfo::~QSystemDeviceInfo( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::inputMethodType +// ----------------------------------------------------------------------------- +// +QSystemDeviceInfo::InputMethodFlags QSystemDeviceInfo::inputMethodType( ) + { + SMC_MOCK_METHOD0( QSystemDeviceInfo::InputMethodFlags ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::imei +// ----------------------------------------------------------------------------- +// +QString QSystemDeviceInfo::imei( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::imsi +// ----------------------------------------------------------------------------- +// +QString QSystemDeviceInfo::imsi( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::manufacturer +// ----------------------------------------------------------------------------- +// +QString QSystemDeviceInfo::manufacturer( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::model +// ----------------------------------------------------------------------------- +// +QString QSystemDeviceInfo::model( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::productName +// ----------------------------------------------------------------------------- +// +QString QSystemDeviceInfo::productName( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::batteryLevel +// ----------------------------------------------------------------------------- +// +int QSystemDeviceInfo::batteryLevel( ) const + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::batteryStatus +// ----------------------------------------------------------------------------- +// +QSystemDeviceInfo::BatteryStatus QSystemDeviceInfo::batteryStatus( ) + { + SMC_MOCK_METHOD0( QSystemDeviceInfo::BatteryStatus ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::isDeviceLocked +// ----------------------------------------------------------------------------- +// +bool QSystemDeviceInfo::isDeviceLocked( ) + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::simStatus +// ----------------------------------------------------------------------------- +// +QSystemDeviceInfo::SimStatus QSystemDeviceInfo::simStatus( ) + { + SMC_MOCK_METHOD0( QSystemDeviceInfo::SimStatus ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::currentProfile +// ----------------------------------------------------------------------------- +// +QSystemDeviceInfo::Profile QSystemDeviceInfo::currentProfile( ) + { + SMC_MOCK_METHOD0( QSystemDeviceInfo::Profile ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::currentPowerState +// ----------------------------------------------------------------------------- +// +QSystemDeviceInfo::PowerState QSystemDeviceInfo::currentPowerState( ) + { + SMC_MOCK_METHOD0( QSystemDeviceInfo::PowerState ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::connectNotify +// ----------------------------------------------------------------------------- +// +void QSystemDeviceInfo::connectNotify(const char *signal) +{ + SMC_MOCK_METHOD1( void, const char *, signal ) +} + + +// ----------------------------------------------------------------------------- +// QSystemDeviceInfo::disconnectNotify +// ----------------------------------------------------------------------------- +// +void QSystemDeviceInfo::disconnectNotify(const char *signal) +{ + SMC_MOCK_METHOD1( void, const char *, signal ) +} + + +// ----------------------------------------------------------------------------- +// QSystemInfo::QSystemInfo +// ----------------------------------------------------------------------------- +// +QSystemInfo::QSystemInfo( QObject * parent ) + : QObject(parent) + { + } + + +// ----------------------------------------------------------------------------- +// QSystemInfo::~QSystemInfo +// ----------------------------------------------------------------------------- +// +QSystemInfo::~QSystemInfo() + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemInfo::currentLanguage +// ----------------------------------------------------------------------------- +// +QString QSystemInfo::currentLanguage() + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemInfo::availableLanguages +// ----------------------------------------------------------------------------- +// +QStringList QSystemInfo::availableLanguages( ) + { + SMC_MOCK_METHOD0( QStringList ) + } + + +// ----------------------------------------------------------------------------- +// QSystemInfo::currentCountryCode +// ----------------------------------------------------------------------------- +// +QString QSystemInfo::currentCountryCode( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemInfo::version +// ----------------------------------------------------------------------------- +// +QString QSystemInfo::version( + QSystemInfo::Version type, + const QString & parameter ) + { + SMC_MOCK_METHOD2( QString, QSystemInfo::Version, type, + const QString &, parameter ) + } + + +// ----------------------------------------------------------------------------- +// QSystemInfo::hasFeatureSupported +// ----------------------------------------------------------------------------- +// +bool QSystemInfo::hasFeatureSupported( + QSystemInfo::Feature feature ) + { + SMC_MOCK_METHOD1( bool, QSystemInfo::Feature, feature ) + } + + +// ----------------------------------------------------------------------------- +// QSystemInfo::connectNotify +// ----------------------------------------------------------------------------- +// +void QSystemInfo::connectNotify(const char *signal) +{ + SMC_MOCK_METHOD1( void, const char *, signal ) +} + + +// ----------------------------------------------------------------------------- +// QSystemInfo::disconnectNotify +// ----------------------------------------------------------------------------- +// +void QSystemInfo::disconnectNotify(const char *signal) +{ + SMC_MOCK_METHOD1( void, const char *, signal ) +} + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::QSystemNetworkInfo +// ----------------------------------------------------------------------------- +// +QSystemNetworkInfo::QSystemNetworkInfo( QObject * parent ) + : QObject(parent) + { + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::~QSystemNetworkInfo +// ----------------------------------------------------------------------------- +// +QSystemNetworkInfo::~QSystemNetworkInfo( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::networkStatus +// ----------------------------------------------------------------------------- +// +Q_INVOKABLE QSystemNetworkInfo::NetworkStatus QSystemNetworkInfo::networkStatus( + QSystemNetworkInfo::NetworkMode mode ) + { + SMC_MOCK_METHOD1( Q_INVOKABLE QSystemNetworkInfo::NetworkStatus, + QSystemNetworkInfo::NetworkMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::networkSignalStrength +// ----------------------------------------------------------------------------- +// +Q_INVOKABLE int QSystemNetworkInfo::networkSignalStrength( + QSystemNetworkInfo::NetworkMode mode ) + { + SMC_MOCK_METHOD1( Q_INVOKABLE int, + QSystemNetworkInfo::NetworkMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::macAddress +// ----------------------------------------------------------------------------- +// +QString QSystemNetworkInfo::macAddress( + QSystemNetworkInfo::NetworkMode mode ) + { + SMC_MOCK_METHOD1( QString, QSystemNetworkInfo::NetworkMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::currentMode +// ----------------------------------------------------------------------------- +// +QSystemNetworkInfo::NetworkMode QSystemNetworkInfo::currentMode( ) + { + SMC_MOCK_METHOD0( QSystemNetworkInfo::NetworkMode ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::cellId +// ----------------------------------------------------------------------------- +// +int QSystemNetworkInfo::cellId( ) + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::locationAreaCode +// ----------------------------------------------------------------------------- +// +int QSystemNetworkInfo::locationAreaCode( ) + { + SMC_MOCK_METHOD0( int ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::currentMobileCountryCode +// ----------------------------------------------------------------------------- +// +QString QSystemNetworkInfo::currentMobileCountryCode( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::currentMobileNetworkCode +// ----------------------------------------------------------------------------- +// +QString QSystemNetworkInfo::currentMobileNetworkCode( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::homeMobileCountryCode +// ----------------------------------------------------------------------------- +// +QString QSystemNetworkInfo::homeMobileCountryCode( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::homeMobileNetworkCode +// ----------------------------------------------------------------------------- +// +QString QSystemNetworkInfo::homeMobileNetworkCode( ) + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::networkName +// ----------------------------------------------------------------------------- +// +Q_INVOKABLE QString QSystemNetworkInfo::networkName( + QSystemNetworkInfo::NetworkMode mode ) + { + SMC_MOCK_METHOD1( Q_INVOKABLE QString, QSystemNetworkInfo::NetworkMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::interfaceForMode +// ----------------------------------------------------------------------------- +// +QNetworkInterface QSystemNetworkInfo::interfaceForMode( + QSystemNetworkInfo::NetworkMode mode ) + { + SMC_MOCK_METHOD1( QNetworkInterface, QSystemNetworkInfo::NetworkMode, mode ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::connectNotify +// ----------------------------------------------------------------------------- +// +void QSystemNetworkInfo::connectNotify( + const char * signal ) + { + SMC_MOCK_METHOD1( void, const char *, signal ) + } + + +// ----------------------------------------------------------------------------- +// QSystemNetworkInfo::disconnectNotify +// ----------------------------------------------------------------------------- +// +void QSystemNetworkInfo::disconnectNotify( + const char * signal ) + { + SMC_MOCK_METHOD1( void, const char *, signal ) + } + + +// ----------------------------------------------------------------------------- +// QSystemScreenSaver::QSystemScreenSaver +// ----------------------------------------------------------------------------- +// +QSystemScreenSaver::QSystemScreenSaver ( QObject * parent ) + : + QObject(parent) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemScreenSaver::~QSystemScreenSaver +// ----------------------------------------------------------------------------- +// +QSystemScreenSaver::~QSystemScreenSaver( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemScreenSaver::screenSaverInhibited +// ----------------------------------------------------------------------------- +// +bool QSystemScreenSaver::screenSaverInhibited( ) + { + SMC_MOCK_METHOD0( bool ) + } + + +// ----------------------------------------------------------------------------- +// QSystemScreenSaver::setScreenSaverInhibit +// ----------------------------------------------------------------------------- +// +Q_INVOKABLE bool QSystemScreenSaver::setScreenSaverInhibit( ) + { + SMC_MOCK_METHOD0( Q_INVOKABLE bool ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDisplayInfo::QSystemDisplayInfo +// ----------------------------------------------------------------------------- +// +QSystemDisplayInfo::QSystemDisplayInfo( + QObject * parent ) + : + QObject( parent ) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemDisplayInfo::~QSystemDisplayInfo +// ----------------------------------------------------------------------------- +// +QSystemDisplayInfo::~QSystemDisplayInfo( ) + { + + } + + +// ----------------------------------------------------------------------------- +// QSystemDisplayInfo::displayBrightness +// ----------------------------------------------------------------------------- +// +int QSystemDisplayInfo::displayBrightness( + int screen ) + { + SMC_MOCK_METHOD1( int, int, screen ) + } + + +// ----------------------------------------------------------------------------- +// QSystemDisplayInfo::colorDepth +// ----------------------------------------------------------------------------- +// +int QSystemDisplayInfo::colorDepth( + int screen ) + { + SMC_MOCK_METHOD1( int, int, screen ) + } + +//#include "moc_qsysteminfo.cpp" + +QTM_END_NAMESPACE diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/qtmobility/mock_xqkeycapture.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/qtmobility/mock_xqkeycapture.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,479 @@ +/** 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 +#include +#include "xqkeycapture.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// XQKeyCapture::XQKeyCapture +// ----------------------------------------------------------------------------- +// +XQKeyCapture::XQKeyCapture( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::~XQKeyCapture +// ----------------------------------------------------------------------------- +// +XQKeyCapture::~XQKeyCapture( ) + { + + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKey( + Qt::Key aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, Qt::Key, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKey( + TUint aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, TUint, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureLongKey( + Qt::Key aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, Qt::Key, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureLongKey( + TUint aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, TUint, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKeyUpAndDowns( + Qt::Key aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, Qt::Key, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKeyUpAndDowns( + TUint aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, TUint, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKey( + XQKeyCaptureKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKey( + XQKeyCaptureNativeKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureNativeKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureLongKey( + XQKeyCaptureKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, XQKeyCaptureKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureLongKey( + XQKeyCaptureNativeKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, XQKeyCaptureNativeKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKeyUpAndDowns( + XQKeyCaptureKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureKeyUpAndDowns( + XQKeyCaptureNativeKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureNativeKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKey( + Qt::Key aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, Qt::Key, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKey( + TUint aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, TUint, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureLongKey( + Qt::Key aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, Qt::Key, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureLongKey( + TUint aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, TUint, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKeyUpAndDowns( + Qt::Key aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, Qt::Key, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKeyUpAndDowns( + TUint aKey, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, TUint, aKey, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKey( + XQKeyCaptureKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKey( + XQKeyCaptureNativeKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureNativeKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureLongKey( + XQKeyCaptureKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, XQKeyCaptureKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureLongKey +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureLongKey( + XQKeyCaptureNativeKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier, + XQKeyCapture::LongFlags aLongType ) + { + SMC_MOCK_METHOD4( bool, XQKeyCaptureNativeKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier, + XQKeyCapture::LongFlags, aLongType ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKeyUpAndDowns( + XQKeyCaptureKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureKeyUpAndDowns +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureKeyUpAndDowns( + XQKeyCaptureNativeKeyList list, + Qt::KeyboardModifiers aModifiersMask, + Qt::KeyboardModifiers aModifier ) + { + SMC_MOCK_METHOD3( bool, XQKeyCaptureNativeKeyList, list, + /*Qt::KeyboardModifiers*/int, aModifiersMask, + /*Qt::KeyboardModifiers*/int, aModifier ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::captureRemoteKeys +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::captureRemoteKeys( + CapturingFlags flags ) + { + SMC_MOCK_METHOD1( bool, /*CapturingFlags*/int, flags ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::cancelCaptureRemoteKeys +// ----------------------------------------------------------------------------- +// +bool XQKeyCapture::cancelCaptureRemoteKeys( + CapturingFlags flags ) + { + SMC_MOCK_METHOD1( bool, /*CapturingFlags*/int, flags ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::remoteEventType_KeyPress +// ----------------------------------------------------------------------------- +// +QEvent::Type XQKeyCapture::remoteEventType_KeyPress( ) + { + SMC_MOCK_METHOD0( QEvent::Type ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::remoteEventType_KeyRelease +// ----------------------------------------------------------------------------- +// +QEvent::Type XQKeyCapture::remoteEventType_KeyRelease( ) + { + SMC_MOCK_METHOD0( QEvent::Type ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::errorString +// ----------------------------------------------------------------------------- +// +QString XQKeyCapture::errorString( ) const + { + SMC_MOCK_METHOD0( QString ) + } + + +// ----------------------------------------------------------------------------- +// XQKeyCapture::errorId +// ----------------------------------------------------------------------------- +// +int XQKeyCapture::errorId( ) const + { + SMC_MOCK_METHOD0( int ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/telephonyaudiorouting/mock_telephonyaudiorouting.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/telephonyaudiorouting/mock_telephonyaudiorouting.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,96 @@ +/** 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 the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include +#include +#include + + +// ============================ MEMBER FUNCTIONS =============================== + +EXPORT_C CTelephonyAudioRouting* CTelephonyAudioRouting::NewL( + MTelephonyAudioRoutingObserver& aObserver ) + { + CTelephonyAudioRoutingProxy* audioRoutingProxy = + CTelephonyAudioRoutingProxy::NewL(aObserver); + return audioRoutingProxy; + } + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRouting::AvailableOutputs +// ----------------------------------------------------------------------------- +// +const TArray& CTelephonyAudioRouting::AvailableOutputs( ) + +//const TArray& CTelephonyAudioRouting::AvailableOutputs( ) + { + SMC_MOCK_METHOD0( const TArray & ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRouting::Output +// ----------------------------------------------------------------------------- +// +CTelephonyAudioRouting::TAudioOutput CTelephonyAudioRouting::Output( ) + { + SMC_MOCK_METHOD0( TAudioOutput ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRouting::SetOutputL +// ----------------------------------------------------------------------------- +// +void CTelephonyAudioRouting::SetOutputL( + TAudioOutput aOutput ) + { + SMC_MOCK_METHOD1( void, TAudioOutput, aOutput ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRouting::PreviousOutput +// ----------------------------------------------------------------------------- +// +CTelephonyAudioRouting::TAudioOutput CTelephonyAudioRouting::PreviousOutput( ) + { + SMC_MOCK_METHOD0( TAudioOutput ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRouting::SetShowNote +// ----------------------------------------------------------------------------- +// +TInt CTelephonyAudioRouting::SetShowNote( + TBool aMode ) + { + SMC_MOCK_METHOD1( TInt, TBool, aMode ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRouting::GetShowNote +// ----------------------------------------------------------------------------- +// +TInt CTelephonyAudioRouting::GetShowNote( + TBool & aMode ) + { + SMC_MOCK_METHOD1( TInt, TBool &, aMode ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/telephonyaudiorouting/mock_telephonyaudioroutingproxy.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/telephonyaudiorouting/mock_telephonyaudioroutingproxy.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,142 @@ +/** 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 the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include +#include +#include +#include "telephonyAudioRoutingSession.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::CTelephonyAudioRoutingProxy +// ----------------------------------------------------------------------------- +// +CTelephonyAudioRoutingProxy::CTelephonyAudioRoutingProxy( + MTelephonyAudioRoutingObserver & aObserver ) + :iObserver(aObserver), + iAvailableOutputs(0, NULL, NULL) + //CTelephonyAudioRouting( /*aObserver*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::ConstructL +// ----------------------------------------------------------------------------- +// +void CTelephonyAudioRoutingProxy::ConstructL( ) + { + + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::NewL +// ----------------------------------------------------------------------------- +// +CTelephonyAudioRoutingProxy * CTelephonyAudioRoutingProxy::NewL( + MTelephonyAudioRoutingObserver & aObserver ) + { + SMC_MOCK_NEWL1( CTelephonyAudioRoutingProxy *, MTelephonyAudioRoutingObserver &, aObserver ) + + CTelephonyAudioRoutingProxy* self = new( ELeave ) CTelephonyAudioRoutingProxy(aObserver); + CleanupStack::PushL( self ); + //self->ConstructL() + CleanupStack::Pop( self ); + return self; + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::~CTelephonyAudioRoutingProxy +// ----------------------------------------------------------------------------- +// +CTelephonyAudioRoutingProxy::~CTelephonyAudioRoutingProxy( ) + { + + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::AvailableOutputs +// ----------------------------------------------------------------------------- +// +const TArray & CTelephonyAudioRoutingProxy::AvailableOutputs( ) + { + SMC_MOCK_METHOD0( const TArray & ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::Output +// ----------------------------------------------------------------------------- +// +CTelephonyAudioRouting::TAudioOutput CTelephonyAudioRoutingProxy::Output( ) + { + SMC_MOCK_METHOD0( TAudioOutput ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::SetOutputL +// ----------------------------------------------------------------------------- +// +void CTelephonyAudioRoutingProxy::SetOutputL( + TAudioOutput aOutput ) + { + SMC_MOCK_METHOD1( void, TAudioOutput, aOutput ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::PreviousOutput +// ----------------------------------------------------------------------------- +// +CTelephonyAudioRouting::TAudioOutput CTelephonyAudioRoutingProxy::PreviousOutput( ) + { + SMC_MOCK_METHOD0( TAudioOutput ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::SetShowNote +// ----------------------------------------------------------------------------- +// +TInt CTelephonyAudioRoutingProxy::SetShowNote( + TBool aMode ) + { + SMC_MOCK_METHOD1( TInt, TBool, aMode ) + } + + +// ----------------------------------------------------------------------------- +// CTelephonyAudioRoutingProxy::GetShowNote +// ----------------------------------------------------------------------------- +// +TInt CTelephonyAudioRoutingProxy::GetShowNote( + TBool & aMode ) + { + if( aMode != ETrue || aMode != EFalse ) + { + aMode = EFalse; + } + + SMC_MOCK_METHOD1( TInt, TBool &, aMode ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/telephonyaudiorouting/mock_telephonyaudioroutingsession.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/telephonyaudiorouting/mock_telephonyaudioroutingsession.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,208 @@ +/** 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 the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include +#include + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::RTelephonyAudioRoutingSession +// ----------------------------------------------------------------------------- +// +RTelephonyAudioRoutingSession::RTelephonyAudioRoutingSession( ) + { + + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::ConnectL +// ----------------------------------------------------------------------------- +// +TInt RTelephonyAudioRoutingSession::ConnectL( + CTelephonyAudioRouting & aAudioRouting, + MTelephonyAudioRoutingObserver & aObserver ) + { + SMC_MOCK_METHOD2( TInt, CTelephonyAudioRouting &, aAudioRouting, + MTelephonyAudioRoutingObserver &, aObserver ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::Close +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::Close( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::Version +// ----------------------------------------------------------------------------- +// +TVersion RTelephonyAudioRoutingSession::Version( ) const + { + SMC_MOCK_METHOD0( TVersion ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::SetOutput +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::SetOutput( + CTelephonyAudioRouting::TAudioOutput aOutput, + TBool aShowNote ) + { + SMC_MOCK_METHOD2( void, CTelephonyAudioRouting::TAudioOutput, aOutput, + TBool, aShowNote ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::GetAvailableOutputsL +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::GetAvailableOutputsL( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::CancelRequest +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::CancelRequest( + TTelAudRtngServRqst aRequest ) + { + SMC_MOCK_METHOD1( void, TTelAudRtngServRqst, aRequest ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::NotifyIfOutputChanged +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::NotifyIfOutputChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::NotifyIfAvailableOutputsChanged +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::NotifyIfAvailableOutputsChanged( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::CurrentAudioOutputPkg +// ----------------------------------------------------------------------------- +// +TPckgBuf & RTelephonyAudioRoutingSession::CurrentAudioOutputPkg( ) + { + SMC_MOCK_METHOD0( TPckgBuf & ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::PreviousAudioOutputPkg +// ----------------------------------------------------------------------------- +// +TPckgBuf & RTelephonyAudioRoutingSession::PreviousAudioOutputPkg( ) + { + SMC_MOCK_METHOD0( TPckgBuf & ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::ErrPkg +// ----------------------------------------------------------------------------- +// +TPckgBuf & RTelephonyAudioRoutingSession::ErrPkg( ) + { + SMC_MOCK_METHOD0( TPckgBuf & ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::AvailableOutputs +// ----------------------------------------------------------------------------- +// +RArray & RTelephonyAudioRoutingSession::AvailableOutputs( ) + { + SMC_MOCK_METHOD0( RArray & ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::SetShowNoteMode +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::SetShowNoteMode( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::ShowNoteMode +// ----------------------------------------------------------------------------- +// +TPckgBuf & RTelephonyAudioRoutingSession::ShowNoteMode( ) + { + SMC_MOCK_METHOD0( TPckgBuf & ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::ResetShowNoteMode +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::ResetShowNoteMode( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::OkToGetShowNoteMode +// ----------------------------------------------------------------------------- +// +TBool RTelephonyAudioRoutingSession::OkToGetShowNoteMode( ) + { + SMC_MOCK_METHOD0( TBool ) + } + + +// ----------------------------------------------------------------------------- +// RTelephonyAudioRoutingSession::GetDefaultValuesL +// ----------------------------------------------------------------------------- +// +void RTelephonyAudioRoutingSession::GetDefaultValuesL( ) + { + SMC_MOCK_METHOD0( void ) + } + + diff -r cfea66083b62 -r baacf668fe89 tsrc/mocks/ut_mockintegrity.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/mocks/ut_mockintegrity.pro Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,55 @@ +# +# 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: Project file for building unit test component +# + +CONFIG += qtestlib hb +TEMPLATE = app +TARGET = +MOC_DIR = moc + +INCLUDEPATH += . \ + /epoc32/include/mw/hb/hbfeedback \ + ../../phoneapp/phoneuiqtviewadapter/inc \ + ../../inc \ + ../../phoneapp/phoneuiutils/inc \ + ../../phoneapp/phoneuiview2/inc \ + ../../phoneapp/phoneringingtoneplayer/inc + +DEFINES += XQSYSINFO_LIBRARY XQSETTINGSMANAGER_LIBRARY +DEFINES += QT_BUILD_SYSINFO_LIB QT_MAKEDLL BUILD_HB_CORE + +QT -= gui +QT += testlib + +symbian: { + CONFIG += no_icon + INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE + LIBS += -lmocklib \ + -lsymbianmock +} + +HEADERS += + +SOURCES += ./mw/*.cpp \ + ./orbit/*.cpp \ + ./phoneuiqtviewadapter/*.cpp \ + ./qtgui/*.cpp \ + ./qthighway/*.cpp \ + ./qtmobility/*.cpp \ + ./bubblemanager/*.cpp \ + ./phonesrv/*.cpp + + +symbian:MMP_RULES += SMPSAFE diff -r cfea66083b62 -r baacf668fe89 tsrc/stubs/phoneuiqtviewadapter/phonevisibilityhandler_stub.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tsrc/stubs/phoneuiqtviewadapter/phonevisibilityhandler_stub.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -0,0 +1,133 @@ +/* +* 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "phonevisibilityhandler.h" +#include "cphonepubsubproxy.h" +#include "phoneconstants.h" +#include "phoneuiqtviewif.h" + +bool m_bringToForegroundCalled; +bool m_bringVideoCallToForegroundCalled; +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::bringVideoCallToForeground. + */ +void PhoneVisibilityHandler::bringVideoCallToForeground() +{ + m_bringVideoCallToForegroundCalled = true; +} + +/*! + PhoneVisibilityHandler::sendToBackground. + */ +void PhoneVisibilityHandler::sendToBackground() +{ + m_sendToBackgroundCalled = true; +} + +/*! + PhoneVisibilityHandler::hideDeviceDialogs. + */ +void PhoneVisibilityHandler::hideDeviceDialogs(bool hide) +{ + Q_UNUSED(hide) +} + +/*! + PhoneVisibilityHandler::ordinalPosition. + */ +bool PhoneVisibilityHandler::phoneVisible() const +{ + m_ordinalPositionCalled = true; + return m_phoneVisibleReturnValue; +} + +void PhoneVisibilityHandler::windowVisibilityChange(bool isVisible) +{ + +} + +/*! + 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() +{ + +} +