# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1277308172 -10800 # Node ID a2467631ae02247f88163732427123c5b647e98f # Parent 7eb70891911c057bb2496eeb466868ea521c016c Revision: 201023 Kit: 2010125 diff -r 7eb70891911c -r a2467631ae02 cellular/SSSettings/inc/CSSSettingsRefreshHandler.h --- a/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h Wed Jun 23 18:49:32 2010 +0300 @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include "csssettingsactiveobject.h" diff -r 7eb70891911c -r a2467631ae02 cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp --- a/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include +#include #include // bt sap central repository key. #include diff -r 7eb70891911c -r a2467631ae02 cellular/SSSettings/xqbindings/bwins/sssettingswrapperu.def --- a/cellular/SSSettings/xqbindings/bwins/sssettingswrapperu.def Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -EXPORTS - ?qt_metacast@SsSettingsWrapper@@UAEPAXPBD@Z @ 1 NONAME ; void * SsSettingsWrapper::qt_metacast(char const *) - ?metaObject@SsSettingsWrapper@@UBEPBUQMetaObject@@XZ @ 2 NONAME ; struct QMetaObject const * SsSettingsWrapper::metaObject(void) const - ??_ESsSettingsWrapper@@UAE@I@Z @ 3 NONAME ; SsSettingsWrapper::~SsSettingsWrapper(unsigned int) - ??1SsSettingsWrapper@@UAE@XZ @ 4 NONAME ; SsSettingsWrapper::~SsSettingsWrapper(void) - ?get@SsSettingsWrapper@@QAEHW4SsSettingsWrapperSettings@@AAH@Z @ 5 NONAME ; int SsSettingsWrapper::get(enum SsSettingsWrapperSettings, int &) - ?staticMetaObject@SsSettingsWrapper@@2UQMetaObject@@B @ 6 NONAME ; struct QMetaObject const SsSettingsWrapper::staticMetaObject - ?set@SsSettingsWrapper@@QAEHW4SsSettingsWrapperSettings@@H@Z @ 7 NONAME ; int SsSettingsWrapper::set(enum SsSettingsWrapperSettings, int) - ?trUtf8@SsSettingsWrapper@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString SsSettingsWrapper::trUtf8(char const *, char const *) - ?qt_metacall@SsSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 9 NONAME ; int SsSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?phoneSettingChanged@SsSettingsWrapper@@IAEXW4SsSettingsWrapperSettings@@H@Z @ 10 NONAME ; void SsSettingsWrapper::phoneSettingChanged(enum SsSettingsWrapperSettings, int) - ?tr@SsSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString SsSettingsWrapper::tr(char const *, char const *, int) - ?tr@SsSettingsWrapper@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString SsSettingsWrapper::tr(char const *, char const *) - ?trUtf8@SsSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString SsSettingsWrapper::trUtf8(char const *, char const *, int) - ??0SsSettingsWrapper@@QAE@PAVQObject@@@Z @ 14 NONAME ; SsSettingsWrapper::SsSettingsWrapper(class QObject *) - ?getStaticMetaObject@SsSettingsWrapper@@SAABUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const & SsSettingsWrapper::getStaticMetaObject(void) - diff -r 7eb70891911c -r a2467631ae02 cellular/SSSettings/xqbindings/eabi/sssettingswrapperu.def --- a/cellular/SSSettings/xqbindings/eabi/sssettingswrapperu.def Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -EXPORTS - _ZN17SsSettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME - _ZN17SsSettingsWrapper11qt_metacastEPKc @ 2 NONAME - _ZN17SsSettingsWrapper16staticMetaObjectE @ 3 NONAME DATA 16 - _ZN17SsSettingsWrapper19getStaticMetaObjectEv @ 4 NONAME - _ZN17SsSettingsWrapper19phoneSettingChangedE25SsSettingsWrapperSettingsi @ 5 NONAME - _ZN17SsSettingsWrapper3getE25SsSettingsWrapperSettingsRi @ 6 NONAME - _ZN17SsSettingsWrapper3setE25SsSettingsWrapperSettingsi @ 7 NONAME - _ZN17SsSettingsWrapperC1EP7QObject @ 8 NONAME - _ZN17SsSettingsWrapperC2EP7QObject @ 9 NONAME - _ZN17SsSettingsWrapperD0Ev @ 10 NONAME - _ZN17SsSettingsWrapperD1Ev @ 11 NONAME - _ZN17SsSettingsWrapperD2Ev @ 12 NONAME - _ZNK17SsSettingsWrapper10metaObjectEv @ 13 NONAME - _ZTI17SsSettingsWrapper @ 14 NONAME - _ZTV17SsSettingsWrapper @ 15 NONAME - diff -r 7eb70891911c -r a2467631ae02 cellular/SSSettings/xqbindings/sssettingswrapper/sssettingswrapper.pro --- a/cellular/SSSettings/xqbindings/sssettingswrapper/sssettingswrapper.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/SSSettings/xqbindings/sssettingswrapper/sssettingswrapper.pro Wed Jun 23 18:49:32 2010 +0300 @@ -35,6 +35,14 @@ TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.UID3 = 0X20029F22 + defFiles = \ + "$${LITERAL_HASH}ifdef WINS" \ + "DEFFILE bwins/sssettingswrapper.def" \ + "$${LITERAL_HASH}else" \ + "DEFFILE eabi/sssettingswrapper.def" \ + "$${LITERAL_HASH}endif" + MMP_RULES += defFiles + # For sis file dllfile.sources = $${TARGET}.dll dllfile.path = $$SHARED_LIB_DIR diff -r 7eb70891911c -r a2467631ae02 cellular/sssettings/xqbindings/sssettingswrapper/bwins/sssettingswrapperu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/sssettings/xqbindings/sssettingswrapper/bwins/sssettingswrapperu.def Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,17 @@ +EXPORTS + ?qt_metacast@SsSettingsWrapper@@UAEPAXPBD@Z @ 1 NONAME ; void * SsSettingsWrapper::qt_metacast(char const *) + ?metaObject@SsSettingsWrapper@@UBEPBUQMetaObject@@XZ @ 2 NONAME ; struct QMetaObject const * SsSettingsWrapper::metaObject(void) const + ??_ESsSettingsWrapper@@UAE@I@Z @ 3 NONAME ; SsSettingsWrapper::~SsSettingsWrapper(unsigned int) + ??1SsSettingsWrapper@@UAE@XZ @ 4 NONAME ; SsSettingsWrapper::~SsSettingsWrapper(void) + ?get@SsSettingsWrapper@@QAEHW4SsSettingsWrapperSettings@@AAH@Z @ 5 NONAME ; int SsSettingsWrapper::get(enum SsSettingsWrapperSettings, int &) + ?staticMetaObject@SsSettingsWrapper@@2UQMetaObject@@B @ 6 NONAME ; struct QMetaObject const SsSettingsWrapper::staticMetaObject + ?set@SsSettingsWrapper@@QAEHW4SsSettingsWrapperSettings@@H@Z @ 7 NONAME ; int SsSettingsWrapper::set(enum SsSettingsWrapperSettings, int) + ?trUtf8@SsSettingsWrapper@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString SsSettingsWrapper::trUtf8(char const *, char const *) + ?qt_metacall@SsSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 9 NONAME ; int SsSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?phoneSettingChanged@SsSettingsWrapper@@IAEXW4SsSettingsWrapperSettings@@H@Z @ 10 NONAME ; void SsSettingsWrapper::phoneSettingChanged(enum SsSettingsWrapperSettings, int) + ?tr@SsSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString SsSettingsWrapper::tr(char const *, char const *, int) + ?tr@SsSettingsWrapper@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString SsSettingsWrapper::tr(char const *, char const *) + ?trUtf8@SsSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString SsSettingsWrapper::trUtf8(char const *, char const *, int) + ??0SsSettingsWrapper@@QAE@PAVQObject@@@Z @ 14 NONAME ; SsSettingsWrapper::SsSettingsWrapper(class QObject *) + ?getStaticMetaObject@SsSettingsWrapper@@SAABUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const & SsSettingsWrapper::getStaticMetaObject(void) + diff -r 7eb70891911c -r a2467631ae02 cellular/sssettings/xqbindings/sssettingswrapper/eabi/sssettingswrapperu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/sssettings/xqbindings/sssettingswrapper/eabi/sssettingswrapperu.def Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,17 @@ +EXPORTS + _ZN17SsSettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME + _ZN17SsSettingsWrapper11qt_metacastEPKc @ 2 NONAME + _ZN17SsSettingsWrapper16staticMetaObjectE @ 3 NONAME DATA 16 + _ZN17SsSettingsWrapper19getStaticMetaObjectEv @ 4 NONAME + _ZN17SsSettingsWrapper19phoneSettingChangedE25SsSettingsWrapperSettingsi @ 5 NONAME + _ZN17SsSettingsWrapper3getE25SsSettingsWrapperSettingsRi @ 6 NONAME + _ZN17SsSettingsWrapper3setE25SsSettingsWrapperSettingsi @ 7 NONAME + _ZN17SsSettingsWrapperC1EP7QObject @ 8 NONAME + _ZN17SsSettingsWrapperC2EP7QObject @ 9 NONAME + _ZN17SsSettingsWrapperD0Ev @ 10 NONAME + _ZN17SsSettingsWrapperD1Ev @ 11 NONAME + _ZN17SsSettingsWrapperD2Ev @ 12 NONAME + _ZNK17SsSettingsWrapper10metaObjectEv @ 13 NONAME + _ZTI17SsSettingsWrapper @ 14 NONAME + _ZTV17SsSettingsWrapper @ 15 NONAME + diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/bwins/psetwrapperu.def --- a/cellular/telephonysettings/xqbindings/bwins/psetwrapperu.def Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -EXPORTS - ?trUtf8@PSetCallBarringWrapper@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString PSetCallBarringWrapper::trUtf8(char const *, char const *, int) - ?getAvailableNetworks@PSetNetworkWrapper@@QAEXXZ @ 2 NONAME ; void PSetNetworkWrapper::getAvailableNetworks(void) - ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0@Z @ 3 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *) - ?getStaticMetaObject@PSetWrapper@@SAABUQMetaObject@@XZ @ 4 NONAME ; struct QMetaObject const & PSetWrapper::getStaticMetaObject(void) - ?staticMetaObject@PSetCallWaitingWrapper@@2UQMetaObject@@B @ 5 NONAME ; struct QMetaObject const PSetCallWaitingWrapper::staticMetaObject - ?staticMetaObject@PSetWrapper@@2UQMetaObject@@B @ 6 NONAME ; struct QMetaObject const PSetWrapper::staticMetaObject - ?disableBarringRequestCompleted@PSetCallBarringWrapper@@IAEXHW4BarringType@1@W4BarringStatus@1@_N@Z @ 7 NONAME ; void PSetCallBarringWrapper::disableBarringRequestCompleted(int, enum PSetCallBarringWrapper::BarringType, enum PSetCallBarringWrapper::BarringStatus, bool) - ??_EPSetWrapper@@UAE@I@Z @ 8 NONAME ; PSetWrapper::~PSetWrapper(unsigned int) - ?trUtf8@PSetCallWaitingWrapper@@SA?AVQString@@PBD0@Z @ 9 NONAME ; class QString PSetCallWaitingWrapper::trUtf8(char const *, char const *) - ?validateDivertNumber@PSetCallDivertingWrapper@@ABEHABVTDesC16@@@Z @ 10 NONAME ; int PSetCallDivertingWrapper::validateDivertNumber(class TDesC16 const &) const - ?qt_metacast@PSetNetworkWrapper@@UAEPAXPBD@Z @ 11 NONAME ; void * PSetNetworkWrapper::qt_metacast(char const *) - ?metaObject@PSetWrapper@@UBEPBUQMetaObject@@XZ @ 12 NONAME ; struct QMetaObject const * PSetWrapper::metaObject(void) const - ?callDivertingWrapper@PSetWrapper@@QAEAAVPSetCallDivertingWrapper@@XZ @ 13 NONAME ; class PSetCallDivertingWrapper & PSetWrapper::callDivertingWrapper(void) - ?getDefaultNumbers@PSetCallDivertingWrapper@@QAEXAAVQStringList@@@Z @ 14 NONAME ; void PSetCallDivertingWrapper::getDefaultNumbers(class QStringList &) - ?getVoiceMailBoxNumber@PSetCallDivertingWrapper@@QAEXAAVQString@@@Z @ 15 NONAME ; void PSetCallDivertingWrapper::getVoiceMailBoxNumber(class QString &) - ?getCallWaitingStatus@PSetCallWaitingWrapper@@QAEXXZ @ 16 NONAME ; void PSetCallWaitingWrapper::getCallWaitingStatus(void) - ?tr@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 17 NONAME ; class QString PSetCliWrapper::tr(char const *, char const *) - ?cliInformation@PSetCliWrapper@@IAEXABW4PsCallLineIdentity@@@Z @ 18 NONAME ; void PSetCliWrapper::cliInformation(enum PsCallLineIdentity const &) - ?handleDivertingError@PSetCallDivertingWrapper@@IAEXH@Z @ 19 NONAME ; void PSetCallDivertingWrapper::handleDivertingError(int) - ?tr@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 20 NONAME ; class QString PSetWrapper::tr(char const *, char const *, int) - ?staticMetaObject@PSetCliWrapper@@2UQMetaObject@@B @ 21 NONAME ; struct QMetaObject const PSetCliWrapper::staticMetaObject - ?cancelRequest@PSetNetworkWrapper@@QAEXXZ @ 22 NONAME ; void PSetNetworkWrapper::cancelRequest(void) - ?qt_metacast@PSetCallBarringWrapper@@UAEPAXPBD@Z @ 23 NONAME ; void * PSetCallBarringWrapper::qt_metacast(char const *) - ?staticMetaObject@PSetCallBarringWrapper@@2UQMetaObject@@B @ 24 NONAME ; struct QMetaObject const PSetCallBarringWrapper::staticMetaObject - ?getClipMode@PSetCliWrapper@@QAEXXZ @ 25 NONAME ; void PSetCliWrapper::getClipMode(void) - ??0PSetCallDivertingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 26 NONAME ; PSetCallDivertingWrapper::PSetCallDivertingWrapper(class CPsetContainer &, class QObject *) - ?metaObject@PSetCliWrapper@@UBEPBUQMetaObject@@XZ @ 27 NONAME ; struct QMetaObject const * PSetCliWrapper::metaObject(void) const - ?tr@PSetCallWaitingWrapper@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString PSetCallWaitingWrapper::tr(char const *, char const *) - ?qt_metacast@PSetCallDivertingWrapper@@UAEPAXPBD@Z @ 29 NONAME ; void * PSetCallDivertingWrapper::qt_metacast(char const *) - ?getNetworkAccessMode@PSetNetworkWrapper@@QBEXXZ @ 30 NONAME ; void PSetNetworkWrapper::getNetworkAccessMode(void) const - ??1PSetCallWaitingWrapper@@UAE@XZ @ 31 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(void) - ?callWaitingWrapper@PSetWrapper@@QAEAAVPSetCallWaitingWrapper@@XZ @ 32 NONAME ; class PSetCallWaitingWrapper & PSetWrapper::callWaitingWrapper(void) - ?handleCnapStatus@PSetCliWrapper@@IAEXH@Z @ 33 NONAME ; void PSetCliWrapper::handleCnapStatus(int) - ?availableNetworksGot@PSetNetworkWrapper@@IAEXAAV?$QList@PAUNetworkInfo@PSetNetworkWrapper@@@@@Z @ 34 NONAME ; void PSetNetworkWrapper::availableNetworksGot(class QList &) - ?handleCallWaitingChanged@PSetCallWaitingWrapper@@IAEXW4PsCallWaitingCommand@1@H@Z @ 35 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingChanged(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) - ?metaObject@PSetCallDivertingWrapper@@UBEPBUQMetaObject@@XZ @ 36 NONAME ; struct QMetaObject const * PSetCallDivertingWrapper::metaObject(void) const - ?cancelProcess@PSetCallDivertingWrapper@@QAEXXZ @ 37 NONAME ; void PSetCallDivertingWrapper::cancelProcess(void) - ?networkWrapper@PSetWrapper@@QAEAAVPSetNetworkWrapper@@XZ @ 38 NONAME ; class PSetNetworkWrapper & PSetWrapper::networkWrapper(void) - ?getColpMode@PSetCliWrapper@@QAEXXZ @ 39 NONAME ; void PSetCliWrapper::getColpMode(void) - ?requestingSelectedNetwork@PSetNetworkWrapper@@IAEX_N@Z @ 40 NONAME ; void PSetNetworkWrapper::requestingSelectedNetwork(bool) - ?metaObject@PSetCallBarringWrapper@@UBEPBUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const * PSetCallBarringWrapper::metaObject(void) const - ?qt_metacall@PSetNetworkWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 42 NONAME ; int PSetNetworkWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?handleDivertingChanged@PSetCallDivertingWrapper@@IAEXABVPSCallDivertingCommand@@_N@Z @ 43 NONAME ; void PSetCallDivertingWrapper::handleDivertingChanged(class PSCallDivertingCommand const &, bool) - ?trUtf8@PSetCallWaitingWrapper@@SA?AVQString@@PBD0H@Z @ 44 NONAME ; class QString PSetCallWaitingWrapper::trUtf8(char const *, char const *, int) - ?networkChanged@PSetNetworkWrapper@@IAEXAAUNetworkInfo@1@AAW4RegistrationStatus@1@@Z @ 45 NONAME ; void PSetNetworkWrapper::networkChanged(struct PSetNetworkWrapper::NetworkInfo &, enum PSetNetworkWrapper::RegistrationStatus &) - ?cliWrapper@PSetWrapper@@QAEAAVPSetCliWrapper@@XZ @ 46 NONAME ; class PSetCliWrapper & PSetWrapper::cliWrapper(void) - ?handleCliStatus@PSetCliWrapper@@IAEXPAEHABW4PsCallLineIdentity@@@Z @ 47 NONAME ; void PSetCliWrapper::handleCliStatus(unsigned char *, int, enum PsCallLineIdentity const &) - ?getStaticMetaObject@PSetCallBarringWrapper@@SAABUQMetaObject@@XZ @ 48 NONAME ; struct QMetaObject const & PSetCallBarringWrapper::getStaticMetaObject(void) - ?qt_metacall@PSetCallDivertingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 49 NONAME ; int PSetCallDivertingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?trUtf8@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 50 NONAME ; class QString PSetCallDivertingWrapper::trUtf8(char const *, char const *, int) - ?getNetworkSelectionMode@PSetNetworkWrapper@@QBE?AW4ErrorCode@1@AAW4NetworkSelectionMode@1@@Z @ 51 NONAME ; enum PSetNetworkWrapper::ErrorCode PSetNetworkWrapper::getNetworkSelectionMode(enum PSetNetworkWrapper::NetworkSelectionMode &) const - ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 52 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *) - ?qt_metacast@PSetCliWrapper@@UAEPAXPBD@Z @ 53 NONAME ; void * PSetCliWrapper::qt_metacast(char const *) - ?callBarringWrapper@PSetWrapper@@QAEAAVPSetCallBarringWrapper@@XZ @ 54 NONAME ; class PSetCallBarringWrapper & PSetWrapper::callBarringWrapper(void) - ?staticMetaObject@PSetCallDivertingWrapper@@2UQMetaObject@@B @ 55 NONAME ; struct QMetaObject const PSetCallDivertingWrapper::staticMetaObject - ??0PSetCliWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 56 NONAME ; PSetCliWrapper::PSetCliWrapper(class CPsetContainer &, class QObject *) - ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 57 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *) - ??0PSetNetworkWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 58 NONAME ; PSetNetworkWrapper::PSetNetworkWrapper(class CPsetContainer &, class QObject *) - ?tr@PSetCallBarringWrapper@@SA?AVQString@@PBD0H@Z @ 59 NONAME ; class QString PSetCallBarringWrapper::tr(char const *, char const *, int) - ?qt_metacall@PSetCallWaitingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 60 NONAME ; int PSetCallWaitingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?networkAccessModeGot@PSetNetworkWrapper@@IAEXH@Z @ 61 NONAME ; void PSetNetworkWrapper::networkAccessModeGot(int) - ?searchingNetworks@PSetNetworkWrapper@@IAEXAAW4RequestType@1@@Z @ 62 NONAME ; void PSetNetworkWrapper::searchingNetworks(enum PSetNetworkWrapper::RequestType &) - ??_EPSetCallBarringWrapper@@UAE@I@Z @ 63 NONAME ; PSetCallBarringWrapper::~PSetCallBarringWrapper(unsigned int) - ?trUtf8@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 64 NONAME ; class QString PSetNetworkWrapper::trUtf8(char const *, char const *) - ?handleDivertingStatus@PSetCallDivertingWrapper@@IAEXAAV?$QList@PAVPSCallDivertingStatus@@@@_N@Z @ 65 NONAME ; void PSetCallDivertingWrapper::handleDivertingStatus(class QList &, bool) - ?getClirMode@PSetCliWrapper@@QAEXXZ @ 66 NONAME ; void PSetCliWrapper::getClirMode(void) - ?getStaticMetaObject@PSetCliWrapper@@SAABUQMetaObject@@XZ @ 67 NONAME ; struct QMetaObject const & PSetCliWrapper::getStaticMetaObject(void) - ??1PSetCallDivertingWrapper@@UAE@XZ @ 68 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(void) - ?selectNetwork@PSetNetworkWrapper@@QAEXABUNetworkInfo@1@@Z @ 69 NONAME ; void PSetNetworkWrapper::selectNetwork(struct PSetNetworkWrapper::NetworkInfo const &) - ?qt_metacall@PSetWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 70 NONAME ; int PSetWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?trUtf8@PSetNetworkWrapper@@SA?AVQString@@PBD0H@Z @ 71 NONAME ; class QString PSetNetworkWrapper::trUtf8(char const *, char const *, int) - ?trUtf8@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 72 NONAME ; class QString PSetCallDivertingWrapper::trUtf8(char const *, char const *) - ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 73 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *, int) - ?handleCliRequesting@PSetCliWrapper@@IAEX_N0@Z @ 74 NONAME ; void PSetCliWrapper::handleCliRequesting(bool, bool) - ?handleCallWaitingError@PSetCallWaitingWrapper@@IAEXH@Z @ 75 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingError(int) - ?enableBarringRequestCompleted@PSetCallBarringWrapper@@IAEXHW4BarringType@1@W4BarringStatus@1@_N@Z @ 76 NONAME ; void PSetCallBarringWrapper::enableBarringRequestCompleted(int, enum PSetCallBarringWrapper::BarringType, enum PSetCallBarringWrapper::BarringStatus, bool) - ?getStaticMetaObject@PSetCallWaitingWrapper@@SAABUQMetaObject@@XZ @ 77 NONAME ; struct QMetaObject const & PSetCallWaitingWrapper::getStaticMetaObject(void) - ?disableBarring@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 78 NONAME ; void PSetCallBarringWrapper::disableBarring(class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) - ?metaObject@PSetCallWaitingWrapper@@UBEPBUQMetaObject@@XZ @ 79 NONAME ; struct QMetaObject const * PSetCallWaitingWrapper::metaObject(void) const - ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 80 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *, int) - ?getCallDivertingStatus@PSetCallDivertingWrapper@@QAEXV?$QFlags@W4PsService@@@@W4PsCallDivertingCondition@@H@Z @ 81 NONAME ; void PSetCallDivertingWrapper::getCallDivertingStatus(class QFlags, enum PsCallDivertingCondition, int) - ?tr@PSetWrapper@@SA?AVQString@@PBD0@Z @ 82 NONAME ; class QString PSetWrapper::tr(char const *, char const *) - ?setNetworkAccessMode@PSetNetworkWrapper@@QAEXW4NetworkAccessMode@1@@Z @ 83 NONAME ; void PSetNetworkWrapper::setNetworkAccessMode(enum PSetNetworkWrapper::NetworkAccessMode) - ?setCallDiverting@PSetCallDivertingWrapper@@QAEHAAVPSCallDivertingCommand@@H@Z @ 84 NONAME ; int PSetCallDivertingWrapper::setCallDiverting(class PSCallDivertingCommand &, int) - ??1PSetCliWrapper@@UAE@XZ @ 85 NONAME ; PSetCliWrapper::~PSetCliWrapper(void) - ?getColrMode@PSetCliWrapper@@QAEXXZ @ 86 NONAME ; void PSetCliWrapper::getColrMode(void) - ??0PSetWrapper@@QAE@PAVQObject@@@Z @ 87 NONAME ; PSetWrapper::PSetWrapper(class QObject *) - ?qt_metacall@PSetCliWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 88 NONAME ; int PSetCliWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?handleCallWaitingRequesting@PSetCallWaitingWrapper@@IAEX_N0@Z @ 89 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingRequesting(bool, bool) - ?trUtf8@PSetCallBarringWrapper@@SA?AVQString@@PBD0@Z @ 90 NONAME ; class QString PSetCallBarringWrapper::trUtf8(char const *, char const *) - ?handleCliError@PSetCliWrapper@@IAEXH@Z @ 91 NONAME ; void PSetCliWrapper::handleCliError(int) - ?cancelAll@PSetCliWrapper@@QAEXXZ @ 92 NONAME ; void PSetCliWrapper::cancelAll(void) - ?barringStatus@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@@Z @ 93 NONAME ; void PSetCallBarringWrapper::barringStatus(class QFlags, enum PSetCallBarringWrapper::BarringType) - ??1PSetWrapper@@UAE@XZ @ 94 NONAME ; PSetWrapper::~PSetWrapper(void) - ?handleCFRequesting@PSetCallDivertingWrapper@@IAEX_N0@Z @ 95 NONAME ; void PSetCallDivertingWrapper::handleCFRequesting(bool, bool) - ?networkReqestFailed@PSetNetworkWrapper@@IAEXW4ErrorCode@1@W4RequestType@1@@Z @ 96 NONAME ; void PSetNetworkWrapper::networkReqestFailed(enum PSetNetworkWrapper::ErrorCode, enum PSetNetworkWrapper::RequestType) - ?cancelProcess@PSetCallWaitingWrapper@@QAEXXZ @ 97 NONAME ; void PSetCallWaitingWrapper::cancelProcess(void) - ?enableBarring@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 98 NONAME ; void PSetCallBarringWrapper::enableBarring(class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) - ?setNewDefaultNumber@PSetCallDivertingWrapper@@QAEXVQString@@@Z @ 99 NONAME ; void PSetCallDivertingWrapper::setNewDefaultNumber(class QString) - ?findPlus@PSetCallDivertingWrapper@@ABE_NABVTDesC16@@@Z @ 100 NONAME ; bool PSetCallDivertingWrapper::findPlus(class TDesC16 const &) const - ??0PSetCallBarringWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 101 NONAME ; PSetCallBarringWrapper::PSetCallBarringWrapper(class CPsetContainer &, class QObject *) - ?barringStatusRequestCompleted@PSetCallBarringWrapper@@IAEXHABV?$QList@E@@W4BarringStatus@1@@Z @ 102 NONAME ; void PSetCallBarringWrapper::barringStatusRequestCompleted(int, class QList const &, enum PSetCallBarringWrapper::BarringStatus) - ??_EPSetNetworkWrapper@@UAE@I@Z @ 103 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(unsigned int) - ??_EPSetCallDivertingWrapper@@UAE@I@Z @ 104 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(unsigned int) - ?setCallWaiting@PSetCallWaitingWrapper@@QAEXW4PsCallWaitingCommand@1@H@Z @ 105 NONAME ; void PSetCallWaitingWrapper::setCallWaiting(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) - ??_EPSetCliWrapper@@UAE@I@Z @ 106 NONAME ; PSetCliWrapper::~PSetCliWrapper(unsigned int) - ?tr@PSetCallBarringWrapper@@SA?AVQString@@PBD0@Z @ 107 NONAME ; class QString PSetCallBarringWrapper::tr(char const *, char const *) - ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0H@Z @ 108 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *, int) - ?handleCallWaitingGetStatus@PSetCallWaitingWrapper@@IAEXW4PsCallWaitingStatus@1@ABV?$QList@E@@@Z @ 109 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingGetStatus(enum PSetCallWaitingWrapper::PsCallWaitingStatus, class QList const &) - ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 110 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *) - ?requestDone@PSetCallDivertingWrapper@@IAEXXZ @ 111 NONAME ; void PSetCallDivertingWrapper::requestDone(void) - ?qt_metacast@PSetWrapper@@UAEPAXPBD@Z @ 112 NONAME ; void * PSetWrapper::qt_metacast(char const *) - ??1PSetCallBarringWrapper@@UAE@XZ @ 113 NONAME ; PSetCallBarringWrapper::~PSetCallBarringWrapper(void) - ?getCnap@PSetCliWrapper@@QAEXXZ @ 114 NONAME ; void PSetCliWrapper::getCnap(void) - ?tr@PSetCliWrapper@@SA?AVQString@@PBD0H@Z @ 115 NONAME ; class QString PSetCliWrapper::tr(char const *, char const *, int) - ?metaObject@PSetNetworkWrapper@@UBEPBUQMetaObject@@XZ @ 116 NONAME ; struct QMetaObject const * PSetNetworkWrapper::metaObject(void) const - ?getStaticMetaObject@PSetCallDivertingWrapper@@SAABUQMetaObject@@XZ @ 117 NONAME ; struct QMetaObject const & PSetCallDivertingWrapper::getStaticMetaObject(void) - ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0H@Z @ 118 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *, int) - ?staticMetaObject@PSetNetworkWrapper@@2UQMetaObject@@B @ 119 NONAME ; struct QMetaObject const PSetNetworkWrapper::staticMetaObject - ?qt_metacast@PSetCallWaitingWrapper@@UAEPAXPBD@Z @ 120 NONAME ; void * PSetCallWaitingWrapper::qt_metacast(char const *) - ??1PSetNetworkWrapper@@UAE@XZ @ 121 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(void) - ?tr@PSetCallWaitingWrapper@@SA?AVQString@@PBD0H@Z @ 122 NONAME ; class QString PSetCallWaitingWrapper::tr(char const *, char const *, int) - ?qt_metacall@PSetCallBarringWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 123 NONAME ; int PSetCallBarringWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ??0PSetCallWaitingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 124 NONAME ; PSetCallWaitingWrapper::PSetCallWaitingWrapper(class CPsetContainer &, class QObject *) - ??_EPSetCallWaitingWrapper@@UAE@I@Z @ 125 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(unsigned int) - ?getStaticMetaObject@PSetNetworkWrapper@@SAABUQMetaObject@@XZ @ 126 NONAME ; struct QMetaObject const & PSetNetworkWrapper::getStaticMetaObject(void) - ?barringPasswordChangeRequestCompleted@PSetCallBarringWrapper@@IAEXH@Z @ 127 NONAME ; void PSetCallBarringWrapper::barringPasswordChangeRequestCompleted(int) - ?changeBarringPassword@PSetCallBarringWrapper@@QAEXABVQString@@00@Z @ 128 NONAME ; void PSetCallBarringWrapper::changeBarringPassword(class QString const &, class QString const &, class QString const &) - diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/eabi/psetwrapperu.def --- a/cellular/telephonysettings/xqbindings/eabi/psetwrapperu.def Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -EXPORTS - _ZN11PSetWrapper10cliWrapperEv @ 1 NONAME - _ZN11PSetWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 2 NONAME - _ZN11PSetWrapper11qt_metacastEPKc @ 3 NONAME - _ZN11PSetWrapper14networkWrapperEv @ 4 NONAME - _ZN11PSetWrapper16staticMetaObjectE @ 5 NONAME DATA 16 - _ZN11PSetWrapper18callBarringWrapperEv @ 6 NONAME - _ZN11PSetWrapper18callWaitingWrapperEv @ 7 NONAME - _ZN11PSetWrapper19getStaticMetaObjectEv @ 8 NONAME - _ZN11PSetWrapper20callDivertingWrapperEv @ 9 NONAME - _ZN11PSetWrapperC1EP7QObject @ 10 NONAME - _ZN11PSetWrapperC2EP7QObject @ 11 NONAME - _ZN11PSetWrapperD0Ev @ 12 NONAME - _ZN11PSetWrapperD1Ev @ 13 NONAME - _ZN11PSetWrapperD2Ev @ 14 NONAME - _ZN14PSetCliWrapper11getClipModeEv @ 15 NONAME - _ZN14PSetCliWrapper11getClirModeEv @ 16 NONAME - _ZN14PSetCliWrapper11getColpModeEv @ 17 NONAME - _ZN14PSetCliWrapper11getColrModeEv @ 18 NONAME - _ZN14PSetCliWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 19 NONAME - _ZN14PSetCliWrapper11qt_metacastEPKc @ 20 NONAME - _ZN14PSetCliWrapper14cliInformationERK18PsCallLineIdentity @ 21 NONAME - _ZN14PSetCliWrapper14handleCliErrorEi @ 22 NONAME - _ZN14PSetCliWrapper15handleCliStatusEPhiRK18PsCallLineIdentity @ 23 NONAME - _ZN14PSetCliWrapper16handleCnapStatusEi @ 24 NONAME - _ZN14PSetCliWrapper16staticMetaObjectE @ 25 NONAME DATA 16 - _ZN14PSetCliWrapper19getStaticMetaObjectEv @ 26 NONAME - _ZN14PSetCliWrapper19handleCliRequestingEbb @ 27 NONAME - _ZN14PSetCliWrapper7getCnapEv @ 28 NONAME - _ZN14PSetCliWrapper9cancelAllEv @ 29 NONAME - _ZN14PSetCliWrapperC1ER14CPsetContainerP7QObject @ 30 NONAME - _ZN14PSetCliWrapperC2ER14CPsetContainerP7QObject @ 31 NONAME - _ZN14PSetCliWrapperD0Ev @ 32 NONAME - _ZN14PSetCliWrapperD1Ev @ 33 NONAME - _ZN14PSetCliWrapperD2Ev @ 34 NONAME - _ZN18PSetNetworkWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 35 NONAME - _ZN18PSetNetworkWrapper11qt_metacastEPKc @ 36 NONAME - _ZN18PSetNetworkWrapper13cancelRequestEv @ 37 NONAME - _ZN18PSetNetworkWrapper13selectNetworkERKNS_11NetworkInfoE @ 38 NONAME - _ZN18PSetNetworkWrapper14networkChangedERNS_11NetworkInfoERNS_18RegistrationStatusE @ 39 NONAME - _ZN18PSetNetworkWrapper16staticMetaObjectE @ 40 NONAME DATA 16 - _ZN18PSetNetworkWrapper17searchingNetworksERNS_11RequestTypeE @ 41 NONAME - _ZN18PSetNetworkWrapper19getStaticMetaObjectEv @ 42 NONAME - _ZN18PSetNetworkWrapper19networkReqestFailedENS_9ErrorCodeENS_11RequestTypeE @ 43 NONAME - _ZN18PSetNetworkWrapper20availableNetworksGotER5QListIPNS_11NetworkInfoEE @ 44 NONAME - _ZN18PSetNetworkWrapper20getAvailableNetworksEv @ 45 NONAME - _ZN18PSetNetworkWrapper20networkAccessModeGotEi @ 46 NONAME - _ZN18PSetNetworkWrapper20setNetworkAccessModeENS_17NetworkAccessModeE @ 47 NONAME - _ZN18PSetNetworkWrapper25requestingSelectedNetworkEb @ 48 NONAME - _ZN18PSetNetworkWrapperC1ER14CPsetContainerP7QObject @ 49 NONAME - _ZN18PSetNetworkWrapperC2ER14CPsetContainerP7QObject @ 50 NONAME - _ZN18PSetNetworkWrapperD0Ev @ 51 NONAME - _ZN18PSetNetworkWrapperD1Ev @ 52 NONAME - _ZN18PSetNetworkWrapperD2Ev @ 53 NONAME - _ZN22PSetCallBarringWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 54 NONAME - _ZN22PSetCallBarringWrapper11qt_metacastEPKc @ 55 NONAME - _ZN22PSetCallBarringWrapper13barringStatusE6QFlagsI9PsServiceENS_11BarringTypeE @ 56 NONAME - _ZN22PSetCallBarringWrapper13enableBarringE6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 57 NONAME - _ZN22PSetCallBarringWrapper14disableBarringE6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 58 NONAME - _ZN22PSetCallBarringWrapper16staticMetaObjectE @ 59 NONAME DATA 16 - _ZN22PSetCallBarringWrapper19getStaticMetaObjectEv @ 60 NONAME - _ZN22PSetCallBarringWrapper29barringStatusRequestCompletedEiRK5QListIhENS_13BarringStatusE @ 61 NONAME - _ZN22PSetCallBarringWrapper29enableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 62 NONAME - _ZN22PSetCallBarringWrapper30disableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 63 NONAME - _ZN22PSetCallBarringWrapperC1ER14CPsetContainerP7QObject @ 64 NONAME - _ZN22PSetCallBarringWrapperC2ER14CPsetContainerP7QObject @ 65 NONAME - _ZN22PSetCallBarringWrapperD0Ev @ 66 NONAME - _ZN22PSetCallBarringWrapperD1Ev @ 67 NONAME - _ZN22PSetCallBarringWrapperD2Ev @ 68 NONAME - _ZN22PSetCallWaitingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 69 NONAME - _ZN22PSetCallWaitingWrapper11qt_metacastEPKc @ 70 NONAME - _ZN22PSetCallWaitingWrapper13cancelProcessEv @ 71 NONAME - _ZN22PSetCallWaitingWrapper14setCallWaitingENS_20PsCallWaitingCommandEi @ 72 NONAME - _ZN22PSetCallWaitingWrapper16staticMetaObjectE @ 73 NONAME DATA 16 - _ZN22PSetCallWaitingWrapper19getStaticMetaObjectEv @ 74 NONAME - _ZN22PSetCallWaitingWrapper20getCallWaitingStatusEv @ 75 NONAME - _ZN22PSetCallWaitingWrapper22handleCallWaitingErrorEi @ 76 NONAME - _ZN22PSetCallWaitingWrapper24handleCallWaitingChangedENS_20PsCallWaitingCommandEi @ 77 NONAME - _ZN22PSetCallWaitingWrapper26handleCallWaitingGetStatusENS_19PsCallWaitingStatusERK5QListIhE @ 78 NONAME - _ZN22PSetCallWaitingWrapper27handleCallWaitingRequestingEbb @ 79 NONAME - _ZN22PSetCallWaitingWrapperC1ER14CPsetContainerP7QObject @ 80 NONAME - _ZN22PSetCallWaitingWrapperC2ER14CPsetContainerP7QObject @ 81 NONAME - _ZN22PSetCallWaitingWrapperD0Ev @ 82 NONAME - _ZN22PSetCallWaitingWrapperD1Ev @ 83 NONAME - _ZN22PSetCallWaitingWrapperD2Ev @ 84 NONAME - _ZN24PSetCallDivertingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 85 NONAME - _ZN24PSetCallDivertingWrapper11qt_metacastEPKc @ 86 NONAME - _ZN24PSetCallDivertingWrapper11requestDoneEv @ 87 NONAME - _ZN24PSetCallDivertingWrapper13cancelProcessEv @ 88 NONAME - _ZN24PSetCallDivertingWrapper16setCallDivertingER22PSCallDivertingCommandi @ 89 NONAME - _ZN24PSetCallDivertingWrapper16staticMetaObjectE @ 90 NONAME DATA 16 - _ZN24PSetCallDivertingWrapper17getDefaultNumbersER11QStringList @ 91 NONAME - _ZN24PSetCallDivertingWrapper18handleCFRequestingEbb @ 92 NONAME - _ZN24PSetCallDivertingWrapper19getStaticMetaObjectEv @ 93 NONAME - _ZN24PSetCallDivertingWrapper19setNewDefaultNumberE7QString @ 94 NONAME - _ZN24PSetCallDivertingWrapper20handleDivertingErrorEi @ 95 NONAME - _ZN24PSetCallDivertingWrapper21getVoiceMailBoxNumberER7QString @ 96 NONAME - _ZN24PSetCallDivertingWrapper21handleDivertingStatusER5QListIP21PSCallDivertingStatusEb @ 97 NONAME - _ZN24PSetCallDivertingWrapper22getCallDivertingStatusE6QFlagsI9PsServiceE24PsCallDivertingConditioni @ 98 NONAME - _ZN24PSetCallDivertingWrapper22handleDivertingChangedERK22PSCallDivertingCommandb @ 99 NONAME - _ZN24PSetCallDivertingWrapperC1ER14CPsetContainerP7QObject @ 100 NONAME - _ZN24PSetCallDivertingWrapperC2ER14CPsetContainerP7QObject @ 101 NONAME - _ZN24PSetCallDivertingWrapperD0Ev @ 102 NONAME - _ZN24PSetCallDivertingWrapperD1Ev @ 103 NONAME - _ZN24PSetCallDivertingWrapperD2Ev @ 104 NONAME - _ZNK11PSetWrapper10metaObjectEv @ 105 NONAME - _ZNK14PSetCliWrapper10metaObjectEv @ 106 NONAME - _ZNK18PSetNetworkWrapper10metaObjectEv @ 107 NONAME - _ZNK18PSetNetworkWrapper20getNetworkAccessModeEv @ 108 NONAME - _ZNK18PSetNetworkWrapper23getNetworkSelectionModeERNS_20NetworkSelectionModeE @ 109 NONAME - _ZNK22PSetCallBarringWrapper10metaObjectEv @ 110 NONAME - _ZNK22PSetCallWaitingWrapper10metaObjectEv @ 111 NONAME - _ZNK24PSetCallDivertingWrapper10metaObjectEv @ 112 NONAME - _ZNK24PSetCallDivertingWrapper20validateDivertNumberERK7TDesC16 @ 113 NONAME - _ZNK24PSetCallDivertingWrapper8findPlusERK7TDesC16 @ 114 NONAME - _ZTI11PSetWrapper @ 115 NONAME - _ZTI14PSetCliWrapper @ 116 NONAME - _ZTI18PSetNetworkWrapper @ 117 NONAME - _ZTI22PSetCallBarringWrapper @ 118 NONAME - _ZTI22PSetCallWaitingWrapper @ 119 NONAME - _ZTI24PSetCallDivertingWrapper @ 120 NONAME - _ZTV11PSetWrapper @ 121 NONAME - _ZTV14PSetCliWrapper @ 122 NONAME - _ZTV18PSetNetworkWrapper @ 123 NONAME - _ZTV22PSetCallBarringWrapper @ 124 NONAME - _ZTV22PSetCallWaitingWrapper @ 125 NONAME - _ZTV24PSetCallDivertingWrapper @ 126 NONAME - _ZN22PSetCallBarringWrapper21changeBarringPasswordERK7QStringS2_S2_ @ 127 NONAME - _ZN22PSetCallBarringWrapper37barringPasswordChangeRequestCompletedEi @ 128 NONAME - diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,131 @@ +EXPORTS + ?trUtf8@PSetCallBarringWrapper@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString PSetCallBarringWrapper::trUtf8(char const *, char const *, int) + ?getAvailableNetworks@PSetNetworkWrapper@@QAEXXZ @ 2 NONAME ; void PSetNetworkWrapper::getAvailableNetworks(void) + ?staticMetaObject@PSetCallWaitingWrapper@@2UQMetaObject@@B @ 3 NONAME ; struct QMetaObject const PSetCallWaitingWrapper::staticMetaObject + ?disableBarringRequestCompleted@PSetCallBarringWrapper@@IAEXHW4BarringType@1@W4BarringStatus@1@_N@Z @ 4 NONAME ; void PSetCallBarringWrapper::disableBarringRequestCompleted(int, enum PSetCallBarringWrapper::BarringType, enum PSetCallBarringWrapper::BarringStatus, bool) + ??_EPSetWrapper@@UAE@I@Z @ 5 NONAME ; PSetWrapper::~PSetWrapper(unsigned int) + ?trUtf8@PSetCallWaitingWrapper@@SA?AVQString@@PBD0@Z @ 6 NONAME ; class QString PSetCallWaitingWrapper::trUtf8(char const *, char const *) + ?validateDivertNumber@PSetCallDivertingWrapper@@ABEHABVTDesC16@@@Z @ 7 NONAME ; int PSetCallDivertingWrapper::validateDivertNumber(class TDesC16 const &) const + ?qt_metacast@PSetNetworkWrapper@@UAEPAXPBD@Z @ 8 NONAME ; void * PSetNetworkWrapper::qt_metacast(char const *) + ?callDivertingWrapper@PSetWrapper@@QAEAAVPSetCallDivertingWrapper@@XZ @ 9 NONAME ; class PSetCallDivertingWrapper & PSetWrapper::callDivertingWrapper(void) + ?cliInformation@PSetCliWrapper@@IAEXABW4PsCallLineIdentity@@@Z @ 10 NONAME ; void PSetCliWrapper::cliInformation(enum PsCallLineIdentity const &) + ?handleDivertingError@PSetCallDivertingWrapper@@IAEXH@Z @ 11 NONAME ; void PSetCallDivertingWrapper::handleDivertingError(int) + ?cancelRequest@PSetNetworkWrapper@@QAEXXZ @ 12 NONAME ; void PSetNetworkWrapper::cancelRequest(void) + ?qt_metacast@PSetCallBarringWrapper@@UAEPAXPBD@Z @ 13 NONAME ; void * PSetCallBarringWrapper::qt_metacast(char const *) + ?staticMetaObject@PSetCallBarringWrapper@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const PSetCallBarringWrapper::staticMetaObject + ??0PSetCallDivertingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 15 NONAME ; PSetCallDivertingWrapper::PSetCallDivertingWrapper(class CPsetContainer &, class QObject *) + ?metaObject@PSetCliWrapper@@UBEPBUQMetaObject@@XZ @ 16 NONAME ; struct QMetaObject const * PSetCliWrapper::metaObject(void) const + ?tr@PSetCallWaitingWrapper@@SA?AVQString@@PBD0@Z @ 17 NONAME ; class QString PSetCallWaitingWrapper::tr(char const *, char const *) + ?getNetworkAccessMode@PSetNetworkWrapper@@QBEXXZ @ 18 NONAME ; void PSetNetworkWrapper::getNetworkAccessMode(void) const + ?callWaitingWrapper@PSetWrapper@@QAEAAVPSetCallWaitingWrapper@@XZ @ 19 NONAME ; class PSetCallWaitingWrapper & PSetWrapper::callWaitingWrapper(void) + ?handleCnapStatus@PSetCliWrapper@@IAEXH@Z @ 20 NONAME ; void PSetCliWrapper::handleCnapStatus(int) + ?availableNetworksGot@PSetNetworkWrapper@@IAEXAAV?$QList@PAUNetworkInfo@PSetNetworkWrapper@@@@@Z @ 21 NONAME ; void PSetNetworkWrapper::availableNetworksGot(class QList &) + ?handleCallWaitingChanged@PSetCallWaitingWrapper@@IAEXW4PsCallWaitingCommand@1@H@Z @ 22 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingChanged(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) + ?metaObject@PSetCallDivertingWrapper@@UBEPBUQMetaObject@@XZ @ 23 NONAME ; struct QMetaObject const * PSetCallDivertingWrapper::metaObject(void) const + ?cancelProcess@PSetCallDivertingWrapper@@QAEXXZ @ 24 NONAME ; void PSetCallDivertingWrapper::cancelProcess(void) + ?trUtf8@PSetCallWaitingWrapper@@SA?AVQString@@PBD0H@Z @ 25 NONAME ; class QString PSetCallWaitingWrapper::trUtf8(char const *, char const *, int) + ?networkChanged@PSetNetworkWrapper@@IAEXAAUNetworkInfo@1@AAW4RegistrationStatus@1@@Z @ 26 NONAME ; void PSetNetworkWrapper::networkChanged(struct PSetNetworkWrapper::NetworkInfo &, enum PSetNetworkWrapper::RegistrationStatus &) + ?trUtf8@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 27 NONAME ; class QString PSetCallDivertingWrapper::trUtf8(char const *, char const *, int) + ?qt_metacast@PSetCliWrapper@@UAEPAXPBD@Z @ 28 NONAME ; void * PSetCliWrapper::qt_metacast(char const *) + ?callBarringWrapper@PSetWrapper@@QAEAAVPSetCallBarringWrapper@@XZ @ 29 NONAME ; class PSetCallBarringWrapper & PSetWrapper::callBarringWrapper(void) + ?tr@PSetCallBarringWrapper@@SA?AVQString@@PBD0H@Z @ 30 NONAME ; class QString PSetCallBarringWrapper::tr(char const *, char const *, int) + ?networkAccessModeGot@PSetNetworkWrapper@@IAEXH@Z @ 31 NONAME ; void PSetNetworkWrapper::networkAccessModeGot(int) + ??_EPSetCallBarringWrapper@@UAE@I@Z @ 32 NONAME ; PSetCallBarringWrapper::~PSetCallBarringWrapper(unsigned int) + ?trUtf8@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 33 NONAME ; class QString PSetNetworkWrapper::trUtf8(char const *, char const *) + ?getClirMode@PSetCliWrapper@@QAEXXZ @ 34 NONAME ; void PSetCliWrapper::getClirMode(void) + ?qt_metacall@PSetWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 35 NONAME ; int PSetWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?trUtf8@PSetNetworkWrapper@@SA?AVQString@@PBD0H@Z @ 36 NONAME ; class QString PSetNetworkWrapper::trUtf8(char const *, char const *, int) + ?trUtf8@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 37 NONAME ; class QString PSetCallDivertingWrapper::trUtf8(char const *, char const *) + ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 38 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *, int) + ?handleCallWaitingError@PSetCallWaitingWrapper@@IAEXH@Z @ 39 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingError(int) + ?getStaticMetaObject@PSetCallWaitingWrapper@@SAABUQMetaObject@@XZ @ 40 NONAME ; struct QMetaObject const & PSetCallWaitingWrapper::getStaticMetaObject(void) + ?disableBarring@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 41 NONAME ; void PSetCallBarringWrapper::disableBarring(class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) + ?tr@PSetWrapper@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString PSetWrapper::tr(char const *, char const *) + ??1PSetCliWrapper@@UAE@XZ @ 43 NONAME ; PSetCliWrapper::~PSetCliWrapper(void) + ?getColrMode@PSetCliWrapper@@QAEXXZ @ 44 NONAME ; void PSetCliWrapper::getColrMode(void) + ?qt_metacall@PSetCliWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 45 NONAME ; int PSetCliWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?handleCallWaitingRequesting@PSetCallWaitingWrapper@@IAEX_N0@Z @ 46 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingRequesting(bool, bool) + ?trUtf8@PSetCallBarringWrapper@@SA?AVQString@@PBD0@Z @ 47 NONAME ; class QString PSetCallBarringWrapper::trUtf8(char const *, char const *) + ?barringStatus@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@@Z @ 48 NONAME ; void PSetCallBarringWrapper::barringStatus(class QFlags, enum PSetCallBarringWrapper::BarringType) + ??1PSetWrapper@@UAE@XZ @ 49 NONAME ; PSetWrapper::~PSetWrapper(void) + ?cancelProcess@PSetCallWaitingWrapper@@QAEXXZ @ 50 NONAME ; void PSetCallWaitingWrapper::cancelProcess(void) + ?findPlus@PSetCallDivertingWrapper@@ABE_NABVTDesC16@@@Z @ 51 NONAME ; bool PSetCallDivertingWrapper::findPlus(class TDesC16 const &) const + ??_EPSetCallDivertingWrapper@@UAE@I@Z @ 52 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(unsigned int) + ?setCallWaiting@PSetCallWaitingWrapper@@QAEXW4PsCallWaitingCommand@1@H@Z @ 53 NONAME ; void PSetCallWaitingWrapper::setCallWaiting(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) + ??_EPSetCliWrapper@@UAE@I@Z @ 54 NONAME ; PSetCliWrapper::~PSetCliWrapper(unsigned int) + ?tr@PSetCallBarringWrapper@@SA?AVQString@@PBD0@Z @ 55 NONAME ; class QString PSetCallBarringWrapper::tr(char const *, char const *) + ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0H@Z @ 56 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *, int) + ?handleCallWaitingGetStatus@PSetCallWaitingWrapper@@IAEXW4PsCallWaitingStatus@1@ABV?$QList@E@@@Z @ 57 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingGetStatus(enum PSetCallWaitingWrapper::PsCallWaitingStatus, class QList const &) + ?requestDone@PSetCallDivertingWrapper@@IAEXXZ @ 58 NONAME ; void PSetCallDivertingWrapper::requestDone(void) + ?qt_metacast@PSetWrapper@@UAEPAXPBD@Z @ 59 NONAME ; void * PSetWrapper::qt_metacast(char const *) + ?tr@PSetCliWrapper@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString PSetCliWrapper::tr(char const *, char const *, int) + ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0H@Z @ 61 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *, int) + ?qt_metacast@PSetCallWaitingWrapper@@UAEPAXPBD@Z @ 62 NONAME ; void * PSetCallWaitingWrapper::qt_metacast(char const *) + ?tr@PSetCallWaitingWrapper@@SA?AVQString@@PBD0H@Z @ 63 NONAME ; class QString PSetCallWaitingWrapper::tr(char const *, char const *, int) + ?getStaticMetaObject@PSetNetworkWrapper@@SAABUQMetaObject@@XZ @ 64 NONAME ; struct QMetaObject const & PSetNetworkWrapper::getStaticMetaObject(void) + ?getStaticMetaObject@PSetWrapper@@SAABUQMetaObject@@XZ @ 65 NONAME ; struct QMetaObject const & PSetWrapper::getStaticMetaObject(void) + ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0@Z @ 66 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *) + ?staticMetaObject@PSetWrapper@@2UQMetaObject@@B @ 67 NONAME ; struct QMetaObject const PSetWrapper::staticMetaObject + ?metaObject@PSetWrapper@@UBEPBUQMetaObject@@XZ @ 68 NONAME ; struct QMetaObject const * PSetWrapper::metaObject(void) const + ?getDefaultNumbers@PSetCallDivertingWrapper@@QAEXAAVQStringList@@@Z @ 69 NONAME ; void PSetCallDivertingWrapper::getDefaultNumbers(class QStringList &) + ?getCallWaitingStatus@PSetCallWaitingWrapper@@QAEXXZ @ 70 NONAME ; void PSetCallWaitingWrapper::getCallWaitingStatus(void) + ?tr@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString PSetCliWrapper::tr(char const *, char const *) + ?staticMetaObject@PSetCliWrapper@@2UQMetaObject@@B @ 72 NONAME ; struct QMetaObject const PSetCliWrapper::staticMetaObject + ?tr@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 73 NONAME ; class QString PSetWrapper::tr(char const *, char const *, int) + ?getClipMode@PSetCliWrapper@@QAEXXZ @ 74 NONAME ; void PSetCliWrapper::getClipMode(void) + ??1PSetCallWaitingWrapper@@UAE@XZ @ 75 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(void) + ?qt_metacast@PSetCallDivertingWrapper@@UAEPAXPBD@Z @ 76 NONAME ; void * PSetCallDivertingWrapper::qt_metacast(char const *) + ?barringPasswordChangeRequestCompleted@PSetCallBarringWrapper@@IAEXH@Z @ 77 NONAME ; void PSetCallBarringWrapper::barringPasswordChangeRequestCompleted(int) + ?networkWrapper@PSetWrapper@@QAEAAVPSetNetworkWrapper@@XZ @ 78 NONAME ; class PSetNetworkWrapper & PSetWrapper::networkWrapper(void) + ?getColpMode@PSetCliWrapper@@QAEXXZ @ 79 NONAME ; void PSetCliWrapper::getColpMode(void) + ?metaObject@PSetCallBarringWrapper@@UBEPBUQMetaObject@@XZ @ 80 NONAME ; struct QMetaObject const * PSetCallBarringWrapper::metaObject(void) const + ?requestingSelectedNetwork@PSetNetworkWrapper@@IAEX_N@Z @ 81 NONAME ; void PSetNetworkWrapper::requestingSelectedNetwork(bool) + ?queryVoiceMailBoxNumber@PSetCallDivertingWrapper@@QAEHAAVQString@@W4PsService@@@Z @ 82 NONAME ; int PSetCallDivertingWrapper::queryVoiceMailBoxNumber(class QString &, enum PsService) + ?qt_metacall@PSetNetworkWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 83 NONAME ; int PSetNetworkWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?handleDivertingChanged@PSetCallDivertingWrapper@@IAEXABVPSCallDivertingCommand@@_N@Z @ 84 NONAME ; void PSetCallDivertingWrapper::handleDivertingChanged(class PSCallDivertingCommand const &, bool) + ?cliWrapper@PSetWrapper@@QAEAAVPSetCliWrapper@@XZ @ 85 NONAME ; class PSetCliWrapper & PSetWrapper::cliWrapper(void) + ?handleCliStatus@PSetCliWrapper@@IAEXPAEHABW4PsCallLineIdentity@@@Z @ 86 NONAME ; void PSetCliWrapper::handleCliStatus(unsigned char *, int, enum PsCallLineIdentity const &) + ?getStaticMetaObject@PSetCallBarringWrapper@@SAABUQMetaObject@@XZ @ 87 NONAME ; struct QMetaObject const & PSetCallBarringWrapper::getStaticMetaObject(void) + ?qt_metacall@PSetCallDivertingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 88 NONAME ; int PSetCallDivertingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?changeBarringPassword@PSetCallBarringWrapper@@QAEXABVQString@@00@Z @ 89 NONAME ; void PSetCallBarringWrapper::changeBarringPassword(class QString const &, class QString const &, class QString const &) + ?getNetworkSelectionMode@PSetNetworkWrapper@@QBE?AW4ErrorCode@1@AAW4NetworkSelectionMode@1@@Z @ 90 NONAME ; enum PSetNetworkWrapper::ErrorCode PSetNetworkWrapper::getNetworkSelectionMode(enum PSetNetworkWrapper::NetworkSelectionMode &) const + ?getVoiceMailBoxNumber@PSetCallDivertingWrapper@@QAEHAAVQString@@W4PsService@@@Z @ 91 NONAME ; int PSetCallDivertingWrapper::getVoiceMailBoxNumber(class QString &, enum PsService) + ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 92 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *) + ?staticMetaObject@PSetCallDivertingWrapper@@2UQMetaObject@@B @ 93 NONAME ; struct QMetaObject const PSetCallDivertingWrapper::staticMetaObject + ??0PSetCliWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 94 NONAME ; PSetCliWrapper::PSetCliWrapper(class CPsetContainer &, class QObject *) + ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 95 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *) + ??0PSetNetworkWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 96 NONAME ; PSetNetworkWrapper::PSetNetworkWrapper(class CPsetContainer &, class QObject *) + ?qt_metacall@PSetCallWaitingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 97 NONAME ; int PSetCallWaitingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?searchingNetworks@PSetNetworkWrapper@@IAEXAAW4RequestType@1@@Z @ 98 NONAME ; void PSetNetworkWrapper::searchingNetworks(enum PSetNetworkWrapper::RequestType &) + ?getStaticMetaObject@PSetCliWrapper@@SAABUQMetaObject@@XZ @ 99 NONAME ; struct QMetaObject const & PSetCliWrapper::getStaticMetaObject(void) + ?handleDivertingStatus@PSetCallDivertingWrapper@@IAEXAAV?$QList@PAVPSCallDivertingStatus@@@@_N@Z @ 100 NONAME ; void PSetCallDivertingWrapper::handleDivertingStatus(class QList &, bool) + ??1PSetCallDivertingWrapper@@UAE@XZ @ 101 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(void) + ?selectNetwork@PSetNetworkWrapper@@QAEXABUNetworkInfo@1@@Z @ 102 NONAME ; void PSetNetworkWrapper::selectNetwork(struct PSetNetworkWrapper::NetworkInfo const &) + ?handleCliRequesting@PSetCliWrapper@@IAEX_N0@Z @ 103 NONAME ; void PSetCliWrapper::handleCliRequesting(bool, bool) + ?enableBarringRequestCompleted@PSetCallBarringWrapper@@IAEXHW4BarringType@1@W4BarringStatus@1@_N@Z @ 104 NONAME ; void PSetCallBarringWrapper::enableBarringRequestCompleted(int, enum PSetCallBarringWrapper::BarringType, enum PSetCallBarringWrapper::BarringStatus, bool) + ?metaObject@PSetCallWaitingWrapper@@UBEPBUQMetaObject@@XZ @ 105 NONAME ; struct QMetaObject const * PSetCallWaitingWrapper::metaObject(void) const + ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 106 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *, int) + ?getCallDivertingStatus@PSetCallDivertingWrapper@@QAEXV?$QFlags@W4PsService@@@@W4PsCallDivertingCondition@@H@Z @ 107 NONAME ; void PSetCallDivertingWrapper::getCallDivertingStatus(class QFlags, enum PsCallDivertingCondition, int) + ?setCallDiverting@PSetCallDivertingWrapper@@QAEHAAVPSCallDivertingCommand@@H@Z @ 108 NONAME ; int PSetCallDivertingWrapper::setCallDiverting(class PSCallDivertingCommand &, int) + ?setNetworkAccessMode@PSetNetworkWrapper@@QAEXW4NetworkAccessMode@1@@Z @ 109 NONAME ; void PSetNetworkWrapper::setNetworkAccessMode(enum PSetNetworkWrapper::NetworkAccessMode) + ??0PSetWrapper@@QAE@PAVQObject@@@Z @ 110 NONAME ; PSetWrapper::PSetWrapper(class QObject *) + ?handleCliError@PSetCliWrapper@@IAEXH@Z @ 111 NONAME ; void PSetCliWrapper::handleCliError(int) + ?handleCFRequesting@PSetCallDivertingWrapper@@IAEX_N0@Z @ 112 NONAME ; void PSetCallDivertingWrapper::handleCFRequesting(bool, bool) + ?cancelAll@PSetCliWrapper@@QAEXXZ @ 113 NONAME ; void PSetCliWrapper::cancelAll(void) + ?networkReqestFailed@PSetNetworkWrapper@@IAEXW4ErrorCode@1@W4RequestType@1@@Z @ 114 NONAME ; void PSetNetworkWrapper::networkReqestFailed(enum PSetNetworkWrapper::ErrorCode, enum PSetNetworkWrapper::RequestType) + ?enableBarring@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 115 NONAME ; void PSetCallBarringWrapper::enableBarring(class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) + ?setNewDefaultNumber@PSetCallDivertingWrapper@@QAEXVQString@@@Z @ 116 NONAME ; void PSetCallDivertingWrapper::setNewDefaultNumber(class QString) + ??0PSetCallBarringWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 117 NONAME ; PSetCallBarringWrapper::PSetCallBarringWrapper(class CPsetContainer &, class QObject *) + ?barringStatusRequestCompleted@PSetCallBarringWrapper@@IAEXHABV?$QList@E@@W4BarringStatus@1@@Z @ 118 NONAME ; void PSetCallBarringWrapper::barringStatusRequestCompleted(int, class QList const &, enum PSetCallBarringWrapper::BarringStatus) + ??_EPSetNetworkWrapper@@UAE@I@Z @ 119 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(unsigned int) + ?getCnap@PSetCliWrapper@@QAEXXZ @ 120 NONAME ; void PSetCliWrapper::getCnap(void) + ??1PSetCallBarringWrapper@@UAE@XZ @ 121 NONAME ; PSetCallBarringWrapper::~PSetCallBarringWrapper(void) + ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 122 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *) + ?getStaticMetaObject@PSetCallDivertingWrapper@@SAABUQMetaObject@@XZ @ 123 NONAME ; struct QMetaObject const & PSetCallDivertingWrapper::getStaticMetaObject(void) + ?metaObject@PSetNetworkWrapper@@UBEPBUQMetaObject@@XZ @ 124 NONAME ; struct QMetaObject const * PSetNetworkWrapper::metaObject(void) const + ??1PSetNetworkWrapper@@UAE@XZ @ 125 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(void) + ?staticMetaObject@PSetNetworkWrapper@@2UQMetaObject@@B @ 126 NONAME ; struct QMetaObject const PSetNetworkWrapper::staticMetaObject + ??_EPSetCallWaitingWrapper@@UAE@I@Z @ 127 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(unsigned int) + ??0PSetCallWaitingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 128 NONAME ; PSetCallWaitingWrapper::PSetCallWaitingWrapper(class CPsetContainer &, class QObject *) + ?qt_metacall@PSetCallBarringWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 129 NONAME ; int PSetCallBarringWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,131 @@ +EXPORTS + _ZN11PSetWrapper10cliWrapperEv @ 1 NONAME + _ZN11PSetWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 2 NONAME + _ZN11PSetWrapper11qt_metacastEPKc @ 3 NONAME + _ZN11PSetWrapper14networkWrapperEv @ 4 NONAME + _ZN11PSetWrapper16staticMetaObjectE @ 5 NONAME DATA 16 + _ZN11PSetWrapper18callBarringWrapperEv @ 6 NONAME + _ZN11PSetWrapper18callWaitingWrapperEv @ 7 NONAME + _ZN11PSetWrapper19getStaticMetaObjectEv @ 8 NONAME + _ZN11PSetWrapper20callDivertingWrapperEv @ 9 NONAME + _ZN11PSetWrapperC1EP7QObject @ 10 NONAME + _ZN11PSetWrapperC2EP7QObject @ 11 NONAME + _ZN11PSetWrapperD0Ev @ 12 NONAME + _ZN11PSetWrapperD1Ev @ 13 NONAME + _ZN11PSetWrapperD2Ev @ 14 NONAME + _ZN14PSetCliWrapper11getClipModeEv @ 15 NONAME + _ZN14PSetCliWrapper11getClirModeEv @ 16 NONAME + _ZN14PSetCliWrapper11getColpModeEv @ 17 NONAME + _ZN14PSetCliWrapper11getColrModeEv @ 18 NONAME + _ZN14PSetCliWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 19 NONAME + _ZN14PSetCliWrapper11qt_metacastEPKc @ 20 NONAME + _ZN14PSetCliWrapper14cliInformationERK18PsCallLineIdentity @ 21 NONAME + _ZN14PSetCliWrapper14handleCliErrorEi @ 22 NONAME + _ZN14PSetCliWrapper15handleCliStatusEPhiRK18PsCallLineIdentity @ 23 NONAME + _ZN14PSetCliWrapper16handleCnapStatusEi @ 24 NONAME + _ZN14PSetCliWrapper16staticMetaObjectE @ 25 NONAME DATA 16 + _ZN14PSetCliWrapper19getStaticMetaObjectEv @ 26 NONAME + _ZN14PSetCliWrapper19handleCliRequestingEbb @ 27 NONAME + _ZN14PSetCliWrapper7getCnapEv @ 28 NONAME + _ZN14PSetCliWrapper9cancelAllEv @ 29 NONAME + _ZN14PSetCliWrapperC1ER14CPsetContainerP7QObject @ 30 NONAME + _ZN14PSetCliWrapperC2ER14CPsetContainerP7QObject @ 31 NONAME + _ZN14PSetCliWrapperD0Ev @ 32 NONAME + _ZN14PSetCliWrapperD1Ev @ 33 NONAME + _ZN14PSetCliWrapperD2Ev @ 34 NONAME + _ZN18PSetNetworkWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 35 NONAME + _ZN18PSetNetworkWrapper11qt_metacastEPKc @ 36 NONAME + _ZN18PSetNetworkWrapper13cancelRequestEv @ 37 NONAME + _ZN18PSetNetworkWrapper13selectNetworkERKNS_11NetworkInfoE @ 38 NONAME + _ZN18PSetNetworkWrapper14networkChangedERNS_11NetworkInfoERNS_18RegistrationStatusE @ 39 NONAME + _ZN18PSetNetworkWrapper16staticMetaObjectE @ 40 NONAME DATA 16 + _ZN18PSetNetworkWrapper17searchingNetworksERNS_11RequestTypeE @ 41 NONAME + _ZN18PSetNetworkWrapper19getStaticMetaObjectEv @ 42 NONAME + _ZN18PSetNetworkWrapper19networkReqestFailedENS_9ErrorCodeENS_11RequestTypeE @ 43 NONAME + _ZN18PSetNetworkWrapper20availableNetworksGotER5QListIPNS_11NetworkInfoEE @ 44 NONAME + _ZN18PSetNetworkWrapper20getAvailableNetworksEv @ 45 NONAME + _ZN18PSetNetworkWrapper20networkAccessModeGotEi @ 46 NONAME + _ZN18PSetNetworkWrapper20setNetworkAccessModeENS_17NetworkAccessModeE @ 47 NONAME + _ZN18PSetNetworkWrapper25requestingSelectedNetworkEb @ 48 NONAME + _ZN18PSetNetworkWrapperC1ER14CPsetContainerP7QObject @ 49 NONAME + _ZN18PSetNetworkWrapperC2ER14CPsetContainerP7QObject @ 50 NONAME + _ZN18PSetNetworkWrapperD0Ev @ 51 NONAME + _ZN18PSetNetworkWrapperD1Ev @ 52 NONAME + _ZN18PSetNetworkWrapperD2Ev @ 53 NONAME + _ZN22PSetCallBarringWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 54 NONAME + _ZN22PSetCallBarringWrapper11qt_metacastEPKc @ 55 NONAME + _ZN22PSetCallBarringWrapper13barringStatusE6QFlagsI9PsServiceENS_11BarringTypeE @ 56 NONAME + _ZN22PSetCallBarringWrapper13enableBarringE6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 57 NONAME + _ZN22PSetCallBarringWrapper14disableBarringE6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 58 NONAME + _ZN22PSetCallBarringWrapper16staticMetaObjectE @ 59 NONAME DATA 16 + _ZN22PSetCallBarringWrapper19getStaticMetaObjectEv @ 60 NONAME + _ZN22PSetCallBarringWrapper21changeBarringPasswordERK7QStringS2_S2_ @ 61 NONAME + _ZN22PSetCallBarringWrapper29barringStatusRequestCompletedEiRK5QListIhENS_13BarringStatusE @ 62 NONAME + _ZN22PSetCallBarringWrapper29enableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 63 NONAME + _ZN22PSetCallBarringWrapper30disableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 64 NONAME + _ZN22PSetCallBarringWrapper37barringPasswordChangeRequestCompletedEi @ 65 NONAME + _ZN22PSetCallBarringWrapperC1ER14CPsetContainerP7QObject @ 66 NONAME + _ZN22PSetCallBarringWrapperC2ER14CPsetContainerP7QObject @ 67 NONAME + _ZN22PSetCallBarringWrapperD0Ev @ 68 NONAME + _ZN22PSetCallBarringWrapperD1Ev @ 69 NONAME + _ZN22PSetCallBarringWrapperD2Ev @ 70 NONAME + _ZN22PSetCallWaitingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 71 NONAME + _ZN22PSetCallWaitingWrapper11qt_metacastEPKc @ 72 NONAME + _ZN22PSetCallWaitingWrapper13cancelProcessEv @ 73 NONAME + _ZN22PSetCallWaitingWrapper14setCallWaitingENS_20PsCallWaitingCommandEi @ 74 NONAME + _ZN22PSetCallWaitingWrapper16staticMetaObjectE @ 75 NONAME DATA 16 + _ZN22PSetCallWaitingWrapper19getStaticMetaObjectEv @ 76 NONAME + _ZN22PSetCallWaitingWrapper20getCallWaitingStatusEv @ 77 NONAME + _ZN22PSetCallWaitingWrapper22handleCallWaitingErrorEi @ 78 NONAME + _ZN22PSetCallWaitingWrapper24handleCallWaitingChangedENS_20PsCallWaitingCommandEi @ 79 NONAME + _ZN22PSetCallWaitingWrapper26handleCallWaitingGetStatusENS_19PsCallWaitingStatusERK5QListIhE @ 80 NONAME + _ZN22PSetCallWaitingWrapper27handleCallWaitingRequestingEbb @ 81 NONAME + _ZN22PSetCallWaitingWrapperC1ER14CPsetContainerP7QObject @ 82 NONAME + _ZN22PSetCallWaitingWrapperC2ER14CPsetContainerP7QObject @ 83 NONAME + _ZN22PSetCallWaitingWrapperD0Ev @ 84 NONAME + _ZN22PSetCallWaitingWrapperD1Ev @ 85 NONAME + _ZN22PSetCallWaitingWrapperD2Ev @ 86 NONAME + _ZN24PSetCallDivertingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 87 NONAME + _ZN24PSetCallDivertingWrapper11qt_metacastEPKc @ 88 NONAME + _ZN24PSetCallDivertingWrapper11requestDoneEv @ 89 NONAME + _ZN24PSetCallDivertingWrapper13cancelProcessEv @ 90 NONAME + _ZN24PSetCallDivertingWrapper16setCallDivertingER22PSCallDivertingCommandi @ 91 NONAME + _ZN24PSetCallDivertingWrapper16staticMetaObjectE @ 92 NONAME DATA 16 + _ZN24PSetCallDivertingWrapper17getDefaultNumbersER11QStringList @ 93 NONAME + _ZN24PSetCallDivertingWrapper18handleCFRequestingEbb @ 94 NONAME + _ZN24PSetCallDivertingWrapper19getStaticMetaObjectEv @ 95 NONAME + _ZN24PSetCallDivertingWrapper19setNewDefaultNumberE7QString @ 96 NONAME + _ZN24PSetCallDivertingWrapper20handleDivertingErrorEi @ 97 NONAME + _ZN24PSetCallDivertingWrapper21getVoiceMailBoxNumberER7QString9PsService @ 98 NONAME + _ZN24PSetCallDivertingWrapper21handleDivertingStatusER5QListIP21PSCallDivertingStatusEb @ 99 NONAME + _ZN24PSetCallDivertingWrapper22getCallDivertingStatusE6QFlagsI9PsServiceE24PsCallDivertingConditioni @ 100 NONAME + _ZN24PSetCallDivertingWrapper22handleDivertingChangedERK22PSCallDivertingCommandb @ 101 NONAME + _ZN24PSetCallDivertingWrapper23queryVoiceMailBoxNumberER7QString9PsService @ 102 NONAME + _ZN24PSetCallDivertingWrapperC1ER14CPsetContainerP7QObject @ 103 NONAME + _ZN24PSetCallDivertingWrapperC2ER14CPsetContainerP7QObject @ 104 NONAME + _ZN24PSetCallDivertingWrapperD0Ev @ 105 NONAME + _ZN24PSetCallDivertingWrapperD1Ev @ 106 NONAME + _ZN24PSetCallDivertingWrapperD2Ev @ 107 NONAME + _ZNK11PSetWrapper10metaObjectEv @ 108 NONAME + _ZNK14PSetCliWrapper10metaObjectEv @ 109 NONAME + _ZNK18PSetNetworkWrapper10metaObjectEv @ 110 NONAME + _ZNK18PSetNetworkWrapper20getNetworkAccessModeEv @ 111 NONAME + _ZNK18PSetNetworkWrapper23getNetworkSelectionModeERNS_20NetworkSelectionModeE @ 112 NONAME + _ZNK22PSetCallBarringWrapper10metaObjectEv @ 113 NONAME + _ZNK22PSetCallWaitingWrapper10metaObjectEv @ 114 NONAME + _ZNK24PSetCallDivertingWrapper10metaObjectEv @ 115 NONAME + _ZNK24PSetCallDivertingWrapper20validateDivertNumberERK7TDesC16 @ 116 NONAME + _ZNK24PSetCallDivertingWrapper8findPlusERK7TDesC16 @ 117 NONAME + _ZTI11PSetWrapper @ 118 NONAME + _ZTI14PSetCliWrapper @ 119 NONAME + _ZTI18PSetNetworkWrapper @ 120 NONAME + _ZTI22PSetCallBarringWrapper @ 121 NONAME + _ZTI22PSetCallWaitingWrapper @ 122 NONAME + _ZTI24PSetCallDivertingWrapper @ 123 NONAME + _ZTV11PSetWrapper @ 124 NONAME + _ZTV14PSetCliWrapper @ 125 NONAME + _ZTV18PSetNetworkWrapper @ 126 NONAME + _ZTV22PSetCallBarringWrapper @ 127 NONAME + _ZTV22PSetCallWaitingWrapper @ 128 NONAME + _ZTV24PSetCallDivertingWrapper @ 129 NONAME + diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pro --- a/cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pro Wed Jun 23 18:49:32 2010 +0300 @@ -41,6 +41,14 @@ TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.UID3 = 0X20029F20 + defFiles = \ + "$${LITERAL_HASH}ifdef WINS" \ + "DEFFILE bwins/psetwrapper.def" \ + "$${LITERAL_HASH}else" \ + "DEFFILE eabi/psetwrapper.def" \ + "$${LITERAL_HASH}endif" + MMP_RULES += defFiles + # For sis file dllfile.sources = $${TARGET}.dll dllfile.path = $$SHARED_LIB_DIR diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -200,9 +200,12 @@ } /*! - PSetCallDivertingWrapper::getVoiceMailBoxNumber + * PSetCallDivertingWrapper::getVoiceMailBoxNumber + * @param aNumber empty if not set + * @return -1 if not supported */ -void PSetCallDivertingWrapper::getVoiceMailBoxNumber(QString &aVmbxNumber) +int PSetCallDivertingWrapper::getVoiceMailBoxNumber( + QString &aNumber, PsService aService) { DPRINT << ": IN"; @@ -213,46 +216,90 @@ TVoiceMailboxParams psetVoiceMailboxParams; // Selected mailbox type is voice - psetVoiceMailboxParams.iType = EVmbxVoice; + psetVoiceMailboxParams.iType = m_Priv->convert(aService); psetVoiceMailboxEntry = 0; - TInt error = psetVoiceMailBox->GetStoredEntry( psetVoiceMailboxParams, psetVoiceMailboxEntry ); - if ( KErrNone == error ) { + int ret = 0; + TInt error = psetVoiceMailBox->GetStoredEntry( + psetVoiceMailboxParams, psetVoiceMailboxEntry); + DPRINT << "error: " << error; + if (KErrNotSupported == error) { + ret = -1; + } else if (KErrNone == error) { // Entry ok, check the number - TPtrC ptrNumber( KNullDesC ); - if ( KErrNone == psetVoiceMailboxEntry->GetVmbxNumber( ptrNumber )) { + TPtrC ptrNumber(KNullDesC); + if (KErrNone == psetVoiceMailboxEntry->GetVmbxNumber(ptrNumber)) { // number ok - aVmbxNumber = QString::fromUtf16(ptrNumber.Ptr(), + aNumber = QString::fromUtf16(ptrNumber.Ptr(), ptrNumber.Length()); - } } - else if ( KErrNotFound == error ) { + + } else { + // illegal argument + } + + delete psetVoiceMailboxEntry; // Entry ownership was transferred + psetVoiceMailboxEntry = NULL; + + DPRINT << "aVmbxNumber: " << aNumber; + DPRINT << ": OUT"; + return ret; +} + +/*! + * PSetCallDivertingWrapper::queryVoiceMailBoxNumber + * @param aNumber empty if not set + * @return -1 if not supported + */ +int PSetCallDivertingWrapper::queryVoiceMailBoxNumber( + QString &aNumber, PsService aService) +{ + DPRINT << ": IN"; + + CVoiceMailboxEntry* psetVoiceMailboxEntry = NULL; + CVoiceMailbox* psetVoiceMailBoxScoped = NULL; + QT_TRAP_THROWING(psetVoiceMailBoxScoped = CVoiceMailbox::NewL()); + QScopedPointer psetVoiceMailBox(psetVoiceMailBoxScoped); + + TVoiceMailboxParams psetVoiceMailboxParams; + // Selected mailbox type is voice + psetVoiceMailboxParams.iType = m_Priv->convert(aService); + psetVoiceMailboxEntry = 0; + int ret = 0; + TInt error = psetVoiceMailBox->GetStoredEntry( + psetVoiceMailboxParams, psetVoiceMailboxEntry); + + if (KErrNotSupported == error) { + ret = -1; + } else if (KErrNone == error || KErrNotFound == error) { // No number defined, query new entry from user - error = psetVoiceMailBox->QueryNewEntry( psetVoiceMailboxParams, psetVoiceMailboxEntry ); + error = psetVoiceMailBox->QueryNewEntry( + psetVoiceMailboxParams, psetVoiceMailboxEntry); - if ( KErrNone == error ) { + if (KErrNone == error) { // Save new entry and get the number. error = psetVoiceMailBox->SaveEntry( *psetVoiceMailboxEntry ); TPtrC ptrNumber( KNullDesC ); if ( KErrNone == psetVoiceMailboxEntry->GetVmbxNumber( ptrNumber )) { // New number ok. - aVmbxNumber = QString::fromUtf16(ptrNumber.Ptr(), + aNumber = QString::fromUtf16(ptrNumber.Ptr(), ptrNumber.Length()); - } - } else { - // New number not given. - DPRINT << "New number error: " << error; } + + } else { + // New number not given. + DPRINT << "New number error: " << error; } - else { + } else { // illegal argument DPRINT << "error: " << error; - } + } delete psetVoiceMailboxEntry; // Entry ownership was transferred psetVoiceMailboxEntry = NULL; - DPRINT << "aVmbxNumber: " << aVmbxNumber; + DPRINT << "aVmbxNumber: " << aNumber; DPRINT << ": OUT"; + return ret; } /*! diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper_p.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper_p.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper_p.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -440,4 +440,25 @@ return ret; } +TVmbxType PSetCallDivertingWrapperPrivate::convert( + PsService aService) +{ + TVmbxType ret = EVmbxNone; + switch (aService) { + case ServiceGroupVoice: + ret = EVmbxVoice; + break; + case ServiceGroupData: + ret = EVmbxVideo; + break; + case ServiceGroupAllTeleservices: + case ServiceGroupFax: + case ServiceGroupUnknown: + default: + ret = EVmbxNone; + break; + } + return ret; +} + // end of file diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper_p.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper_p.h Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper_p.h Wed Jun 23 18:49:32 2010 +0300 @@ -21,6 +21,7 @@ #include #include #include +#include #include "psetcalldivertingwrapper.h" #include "psetwrappertypes.h" @@ -107,6 +108,7 @@ TDivertingStatus convert(PsCallDivertingStatus type); TServiceGroup convert(PsServiceGroup type); TDivertingSetting convert(PsCallDivertingSetting type); + TVmbxType convert(PsService aService); private: PsCallDivertingCondition convert(TCallDivertingCondition type); diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcalldivertingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcalldivertingwrapper.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcalldivertingwrapper.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -108,9 +108,18 @@ // PSetCallDivertingWrapper::getVoiceMailBoxNumber // ----------------------------------------------------------------------------- // -void PSetCallDivertingWrapper::getVoiceMailBoxNumber( - QString & aNumber ) +int PSetCallDivertingWrapper::getVoiceMailBoxNumber( + QString &aNumber, PsService aService) { - SMC_MOCK_METHOD1( void, QString & , aNumber ) + SMC_MOCK_METHOD2( int, QString & , aNumber, PsService, aService ) } +// ----------------------------------------------------------------------------- +// PSetCallDivertingWrapper::queryVoiceMailBoxNumber +// ----------------------------------------------------------------------------- +// +int PSetCallDivertingWrapper::queryVoiceMailBoxNumber( + QString &aNumber, PsService aService) + { + SMC_MOCK_METHOD2( int, QString & , aNumber, PsService, aService ) + } diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -361,47 +361,93 @@ { // Fail case #1, illegal argument QString defNumber; + int ret; + expect("CVoiceMailbox::GetStoredEntry").returns(-2).times(1); - mWrapper->getVoiceMailBoxNumber(defNumber); + ret = mWrapper->getVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, 0); + + // Fail case #2, Not supported. + expect("CVoiceMailbox::GetStoredEntry").returns(-5).times(1); + ret = mWrapper->getVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, -1); - // Fail case #2, New number not given. + // Fail case #3, number nok + expect("CVoiceMailbox::GetStoredEntry").times(1); + expect("CVoiceMailboxEntry::GetVmbxNumber").returns(-1).times(1); + ret = mWrapper->getVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, 0); + + // ok case#1, number and save ok but no new number. expect("CVoiceMailbox::GetStoredEntry").returns(-1).times(1); + ret = mWrapper->getVoiceMailBoxNumber(defNumber, ServiceGroupData); + QCOMPARE(ret, 0); + + // ok case#2, number ok + expect("CVoiceMailbox::GetStoredEntry").times(1); + expect("CVoiceMailboxEntry::GetVmbxNumber").times(1); + ret = mWrapper->getVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, 0); + + expect("CVoiceMailbox::NewL") + .willOnce(invoke(SimulateLeaveL)); + EXPECT_EXCEPTION( + mWrapper->getVoiceMailBoxNumber(defNumber, ServiceGroupFax); + ) + + QVERIFY(true == verify()); +} + +/*! + UT_PSetCallDivertingWrapper::t_queryVoiceMailBoxNumber + */ +void UT_PSetCallDivertingWrapper::t_queryVoiceMailBoxNumber() +{ + // Fail case #1, illegal argument + QString defNumber; + int ret; + expect("CVoiceMailbox::GetStoredEntry").returns(-2).times(1); + ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, 0); + + // Fail case #2, Not supported. + expect("CVoiceMailbox::GetStoredEntry").returns(-5).times(1); + ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, -1); + + // Fail case #3, New number not given. + expect("CVoiceMailbox::GetStoredEntry").times(1); expect("CVoiceMailbox::QueryNewEntry").returns(-5).times(1); - mWrapper->getVoiceMailBoxNumber(defNumber); - - // Fail case #3, save nok + ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, 0); + + // Fail case #4, save nok expect("CVoiceMailbox::GetStoredEntry").returns(-1).times(1); expect("CVoiceMailbox::QueryNewEntry").times(1); expect("CVoiceMailbox::SaveEntry").returns(-4).times(1); - mWrapper->getVoiceMailBoxNumber(defNumber); - - // Fail case #4, number nok - expect("CVoiceMailbox::GetStoredEntry").times(1); - expect("CVoiceMailboxEntry::GetVmbxNumber").returns(-1).times(1); - mWrapper->getVoiceMailBoxNumber(defNumber); - - // ok case#2, number and save ok but no new number. + ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupData); + QCOMPARE(ret, 0); + + // ok case#1, number and save ok but no new number. expect("CVoiceMailbox::GetStoredEntry").returns(-1).times(1); expect("CVoiceMailbox::QueryNewEntry").times(1); expect("CVoiceMailbox::SaveEntry").times(1); expect("CVoiceMailboxEntry::GetVmbxNumber").returns(-5).times(1); - mWrapper->getVoiceMailBoxNumber(defNumber); - - // ok case#1, number ok + ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, 0); + + // ok case#2, number ok expect("CVoiceMailbox::GetStoredEntry").times(1); - expect("CVoiceMailboxEntry::GetVmbxNumber").times(1); - mWrapper->getVoiceMailBoxNumber(defNumber); - - // ok case#2, number and save ok - expect("CVoiceMailbox::GetStoredEntry").returns(-1).times(1); expect("CVoiceMailbox::QueryNewEntry").times(1); expect("CVoiceMailbox::SaveEntry").times(1); - mWrapper->getVoiceMailBoxNumber(defNumber); + expect("CVoiceMailboxEntry::GetVmbxNumber").times(1); + ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupVoice); + QCOMPARE(ret, 0); expect("CVoiceMailbox::NewL") .willOnce(invoke(SimulateLeaveL)); EXPECT_EXCEPTION( - mWrapper->getVoiceMailBoxNumber(defNumber); + mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupFax); ) QVERIFY(true == verify()); diff -r 7eb70891911c -r a2467631ae02 cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.h Fri Jun 11 14:07:16 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.h Wed Jun 23 18:49:32 2010 +0300 @@ -52,6 +52,7 @@ void t_getDefaultNumbersException(); void t_setNewDefaultNumber(); void t_getVoiceMailBoxNumber(); + void t_queryVoiceMailBoxNumber(); void t_swapDefaultNumber(); // tests for private implementation diff -r 7eb70891911c -r a2467631ae02 convergedcallengine/cce/src/cccecallcontainer.cpp --- a/convergedcallengine/cce/src/cccecallcontainer.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/convergedcallengine/cce/src/cccecallcontainer.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -370,7 +370,7 @@ TCallReleaseEntry entry; entry.iCallToRelease = &aCalltoRemove; entry.iUid = aUid; - iCallstoRelease.Append(entry); + iCallstoRelease.Append(entry); if (!iIdle->IsActive()) { iIdle->Start( TCallBack(ReleaseCalls,this) ); @@ -699,7 +699,9 @@ { if( call->ImplementationUid() == aImplementationUid ) { - aCallArray.Append(call); + // return value ignored. Ownership of the call object is not + // transferred to array. + aCallArray.Append(call); } } } @@ -729,8 +731,10 @@ callState == CCPCall::EStateConnecting || callState == CCPCall::EStateConnected ) { - aCallArray.Append( call ); - err = KErrNone; + // Ownership of the call object is not + // transferred to array. + err = aCallArray.Append( call ); + } } } @@ -742,8 +746,8 @@ callState == CCPCall::EStateConnecting || callState == CCPCall::EStateConnected ) { - aCallArray.Append( iEmergencyCall ); - err = KErrNone; + // Ownership of the iEmergencyCall object is not transfered. + err = aCallArray.Append( iEmergencyCall ); } } diff -r 7eb70891911c -r a2467631ae02 convergedcallengine/cce/src/ccceconferencecall.cpp --- a/convergedcallengine/cce/src/ccceconferencecall.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/convergedcallengine/cce/src/ccceconferencecall.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -286,10 +286,11 @@ for( TInt i = 0; i < array.Count(); i++ ) { + // *call ownership is not transfered. const CCCECall* call = iCallContainer.GetCall( array[i] ); // Check if cce call matching to ccp call is available - iCallArray.Append( call ); + iCallArray.Append( call ); // Ignore return value; iCallParameters->SetServiceId( call->ServiceId() ); CCELOGSTRING("CCCEConferenceCall:: Call added to conferencecall"); @@ -390,14 +391,12 @@ TInt CCCEConferenceCall::GetCallArray( RPointerArray& aCallArray ) { TInt err( KErrNotFound ); - - for (TInt a = 0; a < iCallArray.Count(); a++) + TInt count = iCallArray.Count(); + aCallArray.Reserve(count); + for (TInt a = 0; a < count; a++) { - aCallArray.Append( iCallArray[a] ); - err = KErrNone; + err= aCallArray.Append( iCallArray[a] ); } - - return err; } diff -r 7eb70891911c -r a2467631ae02 convergedcallengine/cce/src/cccedtmf.cpp --- a/convergedcallengine/cce/src/cccedtmf.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/convergedcallengine/cce/src/cccedtmf.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -103,7 +103,8 @@ if( !error && provider ) { - aProviders.InsertInAddressOrder( provider ); + // Ref-to-Ptr -> ownership not transfered. + err = aProviders.InsertInAddressOrder( provider ); } } diff -r 7eb70891911c -r a2467631ae02 convergedcallengine/cce/src/cccepluginmanager.cpp --- a/convergedcallengine/cce/src/cccepluginmanager.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/convergedcallengine/cce/src/cccepluginmanager.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -471,7 +471,7 @@ else if( iAlternativeEmergencyPlugins.Find( aUid ) == KErrNotFound ) { CCELOGSTRING("CCCEPluginManager::AddToAlternativeEmergencyArray: New plugin. Append to array "); - iAlternativeEmergencyPlugins.Append( aUid ); + iAlternativeEmergencyPlugins.Append( aUid ); // return value ignored.. } else { @@ -609,12 +609,16 @@ { CCCEPlugin* plugin( NULL ); - for( TInt i=0; iType().iUid == aImplementationUid.iUid ) { plugin = iPluginArray[i]; - i = iPluginArray.Count(); + i = count; } } @@ -656,14 +660,16 @@ { if ( iPluginArray[a]->Type() == aPluginId ) { - iPluginsToClose.Append(iPluginArray[a]); - if (!iIdle->IsActive()) - { - iIdle->Start( TCallBack(RemovePlugins,this) ); + if( KErrNone == iPluginsToClose.Append(iPluginArray[a])) + { + if (!iIdle->IsActive()) + { + iIdle->Start( TCallBack(RemovePlugins,this) ); + } + iPluginArray.Remove(a); + iPluginArray.Compress(); + return; } - iPluginArray.Remove(a); - iPluginArray.Compress(); - return; } } } @@ -688,14 +694,16 @@ { if ( iPluginArray[a]->Type() == aPluginUid ) { - iPluginsToClose.Append(iPluginArray[a]); - if (!iIdle->IsActive()) - { - iIdle->Start( TCallBack(RemovePlugins,this) ); + if( KErrNone == iPluginsToClose.Append(iPluginArray[a])) + { + if (!iIdle->IsActive()) + { + iIdle->Start( TCallBack(RemovePlugins,this) ); + } + iPluginArray.Remove(a); + iPluginArray.Compress(); + return; } - iPluginArray.Remove(a); - iPluginArray.Compress(); - return; } } } diff -r 7eb70891911c -r a2467631ae02 convergedcallengine/spsettings/group/bld.inf --- a/convergedcallengine/spsettings/group/bld.inf Fri Jun 11 14:07:16 2010 +0300 +++ b/convergedcallengine/spsettings/group/bld.inf Wed Jun 23 18:49:32 2010 +0300 @@ -32,7 +32,7 @@ // Generic configuration interface for component cenrep settings ../conf/spsettings.confml MW_LAYER_CONFML(spsettings.confml) -../conf/spsettings_10282e7f.crml MW_LAYER_CRML(spsettings_10282e7f.crml) +../conf/spsettings_10282E7F.crml MW_LAYER_CRML(spsettings_10282E7F.crml) PRJ_MMPFILES serviceprovidersettings.mmp diff -r 7eb70891911c -r a2467631ae02 convergedcallengine/spsettings/src/spsbufferedpublisher.cpp --- a/convergedcallengine/spsettings/src/spsbufferedpublisher.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/convergedcallengine/spsettings/src/spsbufferedpublisher.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -142,7 +142,7 @@ } // Start reading - while( lastModified != iIndex ) + while( lastModified != iIndex ) { iIndex++; @@ -151,8 +151,7 @@ // Skip index if real index is same as KRealGlobalIndex iIndex++; } - - aData.Append( At(data, iIndex) ); + aData.AppendL( At(data, iIndex) ); } } diff -r 7eb70891911c -r a2467631ae02 phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp --- a/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -23,8 +23,8 @@ #include "csosemergencynumberpolicyhandler.h" #include "csosenpolicysatrefresh.h" -#include -#include +#include +#include #include // Property values diff -r 7eb70891911c -r a2467631ae02 phoneclientserver/phoneclient/Src/ImageHandler/RPhCltImageHandler.cpp --- a/phoneclientserver/phoneclient/Src/ImageHandler/RPhCltImageHandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/phoneclientserver/phoneclient/Src/ImageHandler/RPhCltImageHandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -184,7 +184,9 @@ ( TPhCltExtOperatorLogoType ) aImages.iImages[ EPhCltExtLogoTypeIndex ], bitMap ); - iOperatorLogos.Append( logo ); + CleanupStack::PushL(logo); + iOperatorLogos.AppendL( logo ); + CleanupStack::Pop(logo); } } @@ -198,12 +200,14 @@ { // Remove all first. iVTBitMaps.ResetAndDestroy(); - + iVTBitMaps.ReserveL(aImages.iImageCount); for ( TInt i = 0 ; i < aImages.iImageCount; i ++ ) { CFbsBitmap* bitMap = CreateBitMapL( aImages.iImages[ i ] ); - iVTBitMaps.Append( bitMap ); + CleanupStack::PushL( bitMap ); + iVTBitMaps.AppendL( bitMap ); + CleanupStack::Pop(bitMap); } } diff -r 7eb70891911c -r a2467631ae02 phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp --- a/phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -721,8 +721,9 @@ bitMap ); aImages.iImages[ EPhCltExtOperatorLogoIndex ] = bitMap->Handle(); aImages.iImageCount = 1; - iOperatorLogos.Append( logoContainer ); - + CleanupStack::PushL(logoContainer); + iOperatorLogos.AppendL( logoContainer ); + CleanupStack::Pop(logoContainer); CleanupStack::Pop( bitMap ); CleanupStack::PopAndDestroy( hbuf ); diff -r 7eb70891911c -r a2467631ae02 phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp --- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -49,10 +49,12 @@ // CONSTANTS const TInt KPhSrvDefaultValue = 0x00000000; -// const TInt KPhSrvUssdNoTone = 0; // See SharedDataKeysVariant.h or NcnListInternalPSKeys.h +// See SharedDataKeysVariant.h or NcnListInternalPSKeys.h +// const TInt KPhSrvUssdNoTone = 0; // const TInt KPhSrvUssdTimeOutObserverGranularity = 2; // const TInt KPhSrvUssdSentMessageObserverGranularity = 2; -const TInt KPhSrvUssdAppUID = 0x10005955; +// See KUssdSecureId in phcltclientserver.h +//const TInt KPhSrvUssdAppUID = 0x10005955; const TInt KPhSrvUssdMessageQueryInterval = 500000; // 0.5 sec //const TInt KPhSrvUssdNoteExitPeriod = 500000; // 0.5 sec @@ -731,7 +733,7 @@ _DPRINT( 4, "PhSrv.UssdAppTaskExists.wsSession.Connect" ); CleanupClosePushL(wsSession); TApaTaskList tasklist(wsSession); - TApaTask task = tasklist.FindApp(TUid::Uid(KPhSrvUssdAppUID)); + TApaTask task = tasklist.FindApp( KUssdSecureId ); ret = task.Exists(); CleanupStack::PopAndDestroy(); @@ -1720,7 +1722,7 @@ // Find the task with name TApaTaskList tasklist( wsSession ); - TApaTask task = tasklist.FindApp( TUid::Uid( KPhSrvUssdAppUID ) ); + TApaTask task = tasklist.FindApp( KUssdSecureId ); // If task exists, bring it to foreground if ( task.Exists() ) @@ -1737,13 +1739,12 @@ CleanupClosePushL( apaLsSession ); TApaAppInfo appInfo; - TInt err = apaLsSession.GetAppInfo( - appInfo, - TUid::Uid( KPhSrvUssdAppUID ) ); + + TInt err = apaLsSession.GetAppInfo( appInfo, KUssdSecureId ); + _DDPRINT( 4, "PhSrv.RequestStartEditingL.GetAppInfo ", err ); // debug print + if ( err == KErrNone ) { - _DDPRINT( 4, "PhSrv.RequestStartEditingL.GetAppInfo ", err ); // debug print - #ifndef SYMBIAN_SUPPORT_UI_FRAMEWORKS_V1 CApaCommandLine* apaCommandLine = CApaCommandLine::NewLC(); apaCommandLine->SetExecutableNameL( appInfo.iFullName ); @@ -1752,14 +1753,16 @@ CApaCommandLine::NewLC( appInfo.iFullName ); #endif // SYMBIAN_SUPPORT_UI_FRAMEWORKS_V1 - err = apaLsSession.StartApp( *apaCommandLine ); + TThreadId id( static_cast( 0 ) ); + err = apaLsSession.StartApp( *apaCommandLine, id ); + _DDPRINT( 4, "PhSrv.RequestStartEditingL.ThreadId ", id ); CleanupStack::PopAndDestroy( apaCommandLine ); } - CleanupStack::PopAndDestroy(); // apaLsSession + CleanupStack::PopAndDestroy( &apaLsSession ); // apaLsSession // bring the ussd editor to foreground, only for testing TApaTaskList tasklist( wsSession ); - TApaTask task = tasklist.FindApp( TUid::Uid( KPhSrvUssdAppUID ) ); + TApaTask task = tasklist.FindApp( KUssdSecureId ); if ( task.Exists() ) { _DPRINT( 4, "PhSrv.UssdM.RequestStartEditingL.task.BringToForeground" ); diff -r 7eb70891911c -r a2467631ae02 phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerControl.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerControl.h Fri Jun 11 14:07:16 2010 +0300 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerControl.h Wed Jun 23 18:49:32 2010 +0300 @@ -213,11 +213,6 @@ const TRemConExtCallHandlingApiOperationId aOperation ); /** - * Initializes speed dial. - */ - void InitializeSpeedDialL(); - - /** * Returns call status. */ void CallStatusL( RPhone::TLineInfo& aLineInfo ); diff -r 7eb70891911c -r a2467631ae02 phonecmdhandler/phonecmdhnlr/src/PhoneHandler.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "phonehandlercontrol.h" #include "phonehandlerdebug.h" -#include "phonehandler.h" +#include "PhoneHandler.h" // EXTERNAL DATA STRUCTURES diff -r 7eb70891911c -r a2467631ae02 phonecmdhandler/phonecmdhnlr/src/PhoneHandlerControl.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerControl.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerControl.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -485,15 +485,9 @@ // (other items were commented in a header). // ----------------------------------------------------------------------------- // -void CPhoneHandlerControl::SpeedDial( const TInt aIndex ) - { - COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerControl::SpeedDial() aIndex=%d", aIndex ); - - iIndex = aIndex; - - StartProcessing( ERemConExtSpeedDial ); - - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::SpeedDial() end" ); +void CPhoneHandlerControl::SpeedDial( const TInt /*aIndex*/ ) + { + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::SpeedDial() - Not Supported" ); } // ----------------------------------------------------------------------------- @@ -695,16 +689,6 @@ pService = CPhoneHandlerDTMF::NewL( *this ); break; } - - case ERemConExtSpeedDial: - { - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::CreateServiceL() - ERemConExtSpeedDial command" ); - - InitializeSpeedDialL(); - pService = CPhoneHandlerDialCall::NewL( *this, - aOperation ); - break; - } default: { @@ -718,15 +702,6 @@ } // ----------------------------------------------------------------------------- -// CPhoneHandlerControl::InitializeSpeedDialL -// (other items were commented in a header). -// ----------------------------------------------------------------------------- -// -void CPhoneHandlerControl::InitializeSpeedDialL() - { - } - -// ----------------------------------------------------------------------------- // CPhoneHandlerControl::SwitchCall // (other items were commented in a header). // ----------------------------------------------------------------------------- diff -r 7eb70891911c -r a2467631ae02 phonesrv_plat/dialpad_api/inc/dialpad.h --- a/phonesrv_plat/dialpad_api/inc/dialpad.h Fri Jun 11 14:07:16 2010 +0300 +++ b/phonesrv_plat/dialpad_api/inc/dialpad.h Wed Jun 23 18:49:32 2010 +0300 @@ -63,18 +63,14 @@ const QStyleOptionGraphicsItem* option, QWidget* widget); - bool sceneEvent(QEvent *event); - - bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); - - bool handleSceneEvent(QEvent *event); - void showEvent(QShowEvent *event); void hideEvent(QHideEvent *event); void closeEvent(QCloseEvent * event); + void gestureEvent(QGestureEvent *event); + protected slots: void closeAnimValueChanged(qreal value); void closeAnimFinished(); @@ -101,8 +97,6 @@ DialpadInputField* mInputField; DialpadKeypad* mKeypad; DialpadMultitapHandler* mMultitap; - int mMouseButtonPressedDown; - QTime mSwipeTimer; QTimeLine mOpenTimeLine; QTimeLine mCloseTimeLine; bool mAnimationOngoing; diff -r 7eb70891911c -r a2467631ae02 phonesrv_plat/phone_settings_api/inc/psetcalldivertingwrapper.h --- a/phonesrv_plat/phone_settings_api/inc/psetcalldivertingwrapper.h Fri Jun 11 14:07:16 2010 +0300 +++ b/phonesrv_plat/phone_settings_api/inc/psetcalldivertingwrapper.h Wed Jun 23 18:49:32 2010 +0300 @@ -124,8 +124,17 @@ /** * Get voicemailbox number. + * @param aNumber empty if not set + * @return -1 if not supported */ - void getVoiceMailBoxNumber(QString &aNumber); + int getVoiceMailBoxNumber(QString &aNumber, PsService aService); + + /** + * Query voicemailbox number. + * @param aNumber empty if not set + * @return -1 if not supported + */ + int queryVoiceMailBoxNumber(QString &aNumber, PsService aService); signals: // Notify via signals diff -r 7eb70891911c -r a2467631ae02 phonesrv_plat/string_parser_api/inc/CPhoneGsmManufacturerHandler.h --- a/phonesrv_plat/string_parser_api/inc/CPhoneGsmManufacturerHandler.h Fri Jun 11 14:07:16 2010 +0300 +++ b/phonesrv_plat/string_parser_api/inc/CPhoneGsmManufacturerHandler.h Wed Jun 23 18:49:32 2010 +0300 @@ -45,25 +45,20 @@ * EBadPin2Unblock - bad PIN2 unblock request * EActivateRfsNormal - RFS activation * EActivateRfsDeep - RFS activation, deep version - * EActivateWarranty - Warranty application activation * EShowBtAddress - BT address display * EResetWallet - Wallet reset - * ELifeTimer - Life timer * EBTLoopback - BT RF loopback activation/deactivation * EBTDebugMode - BT debug mode activation */ enum { - EShowVersion, EBadPinChange, EBadPin2Change, EBadPinUnblock, EBadPin2Unblock, EActivateRfsNormal, EActivateRfsDeep, - EActivateWarranty, EShowBtAddress, - ELifeTimer, EBTLoopback, EShowWlanMac, EBTDebugMode diff -r 7eb70891911c -r a2467631ae02 phonesrv_plat/string_parser_api/inc/CPhoneGsmMiscHandler.h --- a/phonesrv_plat/string_parser_api/inc/CPhoneGsmMiscHandler.h Fri Jun 11 14:07:16 2010 +0300 +++ b/phonesrv_plat/string_parser_api/inc/CPhoneGsmMiscHandler.h Wed Jun 23 18:49:32 2010 +0300 @@ -36,11 +36,6 @@ public: // New functions /** - * Process IMEI display. - */ - virtual void ProcessShowIMEIL() = 0; - - /** * Process USSD request. * * @param aString It is string to be sent. diff -r 7eb70891911c -r a2467631ae02 phonesrv_plat/string_parser_api/inc/CPhoneGsmParserBase.h --- a/phonesrv_plat/string_parser_api/inc/CPhoneGsmParserBase.h Fri Jun 11 14:07:16 2010 +0300 +++ b/phonesrv_plat/string_parser_api/inc/CPhoneGsmParserBase.h Wed Jun 23 18:49:32 2010 +0300 @@ -70,7 +70,7 @@ const TUint32 KPhoneGsmUidDialPhoneNumber = 3; /** -* Misc GSM required strings, most notably USSD and IMEI. +* Misc GSM required strings, most notably USSD. */ const TUint32 KPhoneGsmUidMisc = 4; @@ -104,8 +104,6 @@ */ const TUint32 KPhoneUidUnstructuredService = PHONE_MAKE_UID( KPhoneGsmUidMisc, 0 ); -const TUint32 KPhoneUidIMEI = - PHONE_MAKE_UID( KPhoneGsmUidMisc, 1 ); // FORWARD DECLARATIONS class CPhoneGsmParserResult; diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Commands/SetUpCallCmd/group/SetUpCallCmd.mmp --- a/satengine/SatServer/Commands/SetUpCallCmd/group/SetUpCallCmd.mmp Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Commands/SetUpCallCmd/group/SetUpCallCmd.mmp Wed Jun 23 18:49:32 2010 +0300 @@ -31,6 +31,7 @@ SOURCE std.cpp SOURCE CSetUpCallHandler.cpp SOURCE csetupcallrequesthandler.cpp +SOURCE csetupcalldtmfsender.cpp START RESOURCE 1000f005.rss TARGET SetUpCallCmd.rsc @@ -48,7 +49,7 @@ LIBRARY etelsat.lib LIBRARY etelmm.lib LIBRARY etel.lib -LIBRARY SatEngine.lib +LIBRARY satengine.lib #ifdef ENABLE_SAT_LOGGING LIBRARY flogger.lib diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Commands/SetUpCallCmd/inc/CSetUpCallHandler.h --- a/satengine/SatServer/Commands/SetUpCallCmd/inc/CSetUpCallHandler.h Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Commands/SetUpCallCmd/inc/CSetUpCallHandler.h Wed Jun 23 18:49:32 2010 +0300 @@ -67,21 +67,6 @@ */ void SetupCallRequestComplete( const TInt aErrCode ); - /** - * TSetupCallStatus - * setup call status, when there is an asynchronous - * operation is handling by the CSetupCallCallRequestHandler - * we will save some status information - */ - enum TSetupCallStatus - { - ESetupCallIdle = 0, - ESetupCallDialWaiting, - ESetupCallTerminateWaiting, - ESetupCallEmergencyWaiting - }; - - protected: // from base class CActive @@ -252,11 +237,6 @@ TBool iCallControlActive; /** - * Dial completion status - */ - TInt iSetUpCallStatus; - - /** * wait scheduler */ CActiveSchedulerWait iWait; diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Commands/SetUpCallCmd/inc/csetupcallrequesthandler.h --- a/satengine/SatServer/Commands/SetUpCallCmd/inc/csetupcallrequesthandler.h Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Commands/SetUpCallCmd/inc/csetupcallrequesthandler.h Wed Jun 23 18:49:32 2010 +0300 @@ -24,6 +24,7 @@ class CSetUpCallHandler; class MSatAsyncToSync; +class CSetupCallDtmfSender; /** * This is the handler for the ETel MM api Request. @@ -32,7 +33,7 @@ * */ -class CSetupCallRequestHandler : public CActive +NONSHARABLE_CLASS ( CSetupCallRequestHandler ) : public CActive { public: @@ -54,14 +55,14 @@ * Access RMobileCall::DialNoFdnCheck by MSatMultiModeApi * for the paramter information please see the etelmm.h */ - void DialNumber( const TDesC8& aCallParams, const TDesC& aTelNumber, + void DialNumber( const TDesC8& aCallParams, TDes& aTelNumber, TBool aTerminateOtherCall, MSatAsyncToSync* aAsyncToSync ); /** * Access RMobileCall::DialEmergencyCall by MSatMultiModeApi * for the paramter information please see the etelmm.h */ - void DialEmergencyCall( const TDesC& aTelNumber ); + void DialEmergencyCall( const TDesC& aTelNumber ); /** * Cancel the asynchronous operations that required to the ETel MM api @@ -103,12 +104,11 @@ * Pointer to SendSs command handler */ CSetUpCallHandler* iDispatcher; - + /** - * Current call is an emergency call. - */ - TBool iEmergencyCall; - + * Own. Dtmf sender + */ + CSetupCallDtmfSender* iDtmfSender; }; #endif // CSETUPCALLREQUESTHANDLER_H diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Commands/SetUpCallCmd/src/CSetUpCallHandler.cpp --- a/satengine/SatServer/Commands/SetUpCallCmd/src/CSetUpCallHandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Commands/SetUpCallCmd/src/CSetUpCallHandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -87,7 +87,6 @@ LOG( SIMPLE, "SETUPCALL: CSetUpCallHandler::~CSetUpCallHandler calling" ) Cancel(); - delete iRequestHandler; iRequestHandler = NULL; @@ -537,7 +536,6 @@ if( !iEmergencyCall ) { - iSetUpCallStatus = ESetupCallIdle; CompleteSetupCallWithStatus( aErrCode ); } else @@ -568,7 +566,6 @@ "SETUPCALL: CSetUpCallHandler::SetupCallRequestComplete exiting %d", aErrCode ) } - // ----------------------------------------------------------------------------- // C++ default constructor can NOT contain any code, that // might leave. @@ -624,7 +621,7 @@ { LOG( SIMPLE, "SETUPCALL: CSetUpCallHandler::DoSetupCallL calling" ) - if( CheckSetupCallParam () ) + if( CheckSetupCallParam() ) { RSat::TSetUpCallType callType( iSetUpCallData.iType ); @@ -939,6 +936,7 @@ aNumber[i] = KExpansionChar; } } + LOG2( SIMPLE, "SETUPCALL: CSetUpCallHandler::CheckNumber length of aNumber: %d", aNumber.Length() ) @@ -993,8 +991,7 @@ } LOG2( SIMPLE, "SETUPCALL: CSetUpCallHandler::CheckSetupCallParam exiting %d", valid ) + return valid; } - - // End Of File diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Commands/SetUpCallCmd/src/csetupcallrequesthandler.cpp --- a/satengine/SatServer/Commands/SetUpCallCmd/src/csetupcallrequesthandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Commands/SetUpCallCmd/src/csetupcallrequesthandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -19,9 +19,9 @@ #include #include - #include "csetupcallrequesthandler.h" #include "CSetUpCallHandler.h" +#include "csetupcalldtmfsender.h" #include "msatasynctosync.h" #include "SatLog.h" @@ -60,6 +60,8 @@ CSetupCallRequestHandler* self = new ( ELeave ) CSetupCallRequestHandler( aPhone, aDispatcher ); + + self->iDtmfSender = CSetupCallDtmfSender::NewL( aPhone ); LOG( SIMPLE, "SETUPCALL: CSetupCallRequestHandler::NewL exiting" ) return self; @@ -76,6 +78,9 @@ CSetupCallRequestHandler::~CSetupCallRequestHandler calling" ) Cancel(); iDispatcher = NULL; + + delete iDtmfSender; + iDtmfSender = NULL; LOG( SIMPLE, "SETUPCALL: \ CSetupCallRequestHandler::~CSetupCallRequestHandler exiting" ) @@ -86,7 +91,7 @@ // ----------------------------------------------------------------------------- // void CSetupCallRequestHandler::DialNumber( const TDesC8& aCallParams, - const TDesC& aTelNumber, TBool aTerminateOtherCall, + TDes& aTelNumber, TBool aTerminateOtherCall, MSatAsyncToSync* aAsyncToSync ) { LOG( SIMPLE, "SETUPCALL: CSetupCallRequestHandler::DialNumber calling" ) @@ -97,7 +102,7 @@ { if( aAsyncToSync ) { - iPhone.TerminateAllCalls( aAsyncToSync->RequestStatus() ); + iPhone.TerminateActiveCalls( aAsyncToSync->RequestStatus() ); terminateRes = aAsyncToSync->SetActiveAndWait(); } else @@ -112,6 +117,10 @@ { if( KErrNone == terminateRes ) { + // Separate dtmf string from whole number and store in iDtmfString + // the dtmf string will be removed from aTelNumber + iDtmfSender->SeparateDtmfFromTelNumber(aTelNumber); + // Dial the purl tel number iPhone.DialNoFdnCheck( iStatus, aCallParams, aTelNumber ); SetActive(); } @@ -138,7 +147,6 @@ if( !IsActive() ) { - iEmergencyCall = ETrue; iPhone.DialEmergencyCall( iStatus, aTelNumber ); SetActive(); } @@ -147,7 +155,8 @@ iDispatcher->SetupCallRequestComplete( KErrInUse ); } - LOG( SIMPLE, "SETUPCALL: CSetupCallRequestHandler::DialEmergencyCall exiting" ) + LOG( SIMPLE, + "SETUPCALL: CSetupCallRequestHandler::DialEmergencyCall exiting" ) } // ----------------------------------------------------------------------------- @@ -157,18 +166,16 @@ // void CSetupCallRequestHandler::RunL() { - LOG( SIMPLE, "SETUPCALL: CSetupCallRequestHandler::RunL calling" ) + LOG2( SIMPLE, "SETUPCALL: CSetupCallRequestHandler::RunL calling\ + iStatus=%i", iStatus.Int() ) + + iDispatcher->SetupCallRequestComplete( iStatus.Int() ); - LOG2( NORMAL, "SETUPCALL: CSetupCallRequestHandler::RunL\ - iStatus == %i", iStatus.Int() ) - - if ( iEmergencyCall ) + if ( KErrNone == iStatus.Int() ) { - iEmergencyCall = EFalse; + iDtmfSender->SendDtmfString(); } - iDispatcher->SetupCallRequestComplete( iStatus.Int() ); - LOG( SIMPLE, "SETUPCALL: CSetupCallRequestHandler::RunL exiting" ) } @@ -181,6 +188,7 @@ LOG( SIMPLE, "SETUPCALL: \ CSetupCallRequestHandler::CancelOperation calling" ) iPhone.DialCancel(); + iDtmfSender->Cancel(); LOG( SIMPLE, "SETUPCALL: CSetupCallRequestHandler::CancelOperation exiting" ) } diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Engine/inc/csatmultimodeapi.h --- a/satengine/SatServer/Engine/inc/csatmultimodeapi.h Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Engine/inc/csatmultimodeapi.h Wed Jun 23 18:49:32 2010 +0300 @@ -109,7 +109,13 @@ * Access RMobilePhone::SendDTMFTones * for the paramter information please see the etelmm.h */ - void SendDTMFTones( TRequestStatus& aReqStatus, const TDesC& aTones); + void SendDTMFTones( TRequestStatus& aReqStatus, const TDesC& aTones); + + /** + * Access RMobilePhone::ContinueDTMFStringSending + * for the paramter information please see the etelmm.h + */ + TInt ContinueDTMFStringSending( TBool aContinue ); /** * Access RMobilePhone::CancelAsyncRequest @@ -165,9 +171,9 @@ */ void NotifyCallStatusChangeCancel(); /** - * Access RMobilePhone::TerminateAllCalls NotifyMobileCallStatusChange + * Access RMobilePhone::TerminateActiveCalls NotifyMobileCallStatusChange */ - void TerminateAllCalls(TRequestStatus& aReqStatus); + void TerminateActiveCalls(TRequestStatus& aReqStatus); /** diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Engine/src/CSatApnHandler.cpp --- a/satengine/SatServer/Engine/src/CSatApnHandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Engine/src/CSatApnHandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -276,7 +276,7 @@ cm.SetIntAttributeL( CMManager::ECmWapIPWSPOption, CMManager::ECmWapWspOptionConnectionOriented ); cm.SetBoolAttributeL( CMManager::EPacketDataDisablePlainTextAuth, EFalse ); - cm.SetIntAttributeL( CMManager::ECmIFPromptForAuth, EFalse ); + cm.SetBoolAttributeL( CMManager::ECmIFPromptForAuth, EFalse ); if ( aUserLogin != KNullDesC ) { diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/Engine/src/csatmultimodeapi.cpp --- a/satengine/SatServer/Engine/src/csatmultimodeapi.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/Engine/src/csatmultimodeapi.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -218,6 +218,17 @@ } // ----------------------------------------------------------------------------- +// CSatMultiModeApi::ContinueDTMFStringSending +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TInt CSatMultiModeApi::ContinueDTMFStringSending( TBool aContinue ) + { + LOG( SIMPLE, "SATENGINE: CSatMultiModeApi::ContinueDTMFStringSending" ) + return iPhone.ContinueDTMFStringSending( aContinue ); + } + +// ----------------------------------------------------------------------------- // CSatMultiModeApi::DialNoFdnCheck // (other items were commented in a header). // ----------------------------------------------------------------------------- @@ -390,14 +401,12 @@ // CSatMultiModeApi::NotifyMobileCallStatusChange // ----------------------------------------------------------------------------- // -void CSatMultiModeApi::TerminateAllCalls(TRequestStatus& aReqStatus) +void CSatMultiModeApi::TerminateActiveCalls(TRequestStatus& aReqStatus) { LOG( SIMPLE, "SATENGINE: CSatMultiModeApi::TerminateAllCalls calling" ) - // RMobilePhone::TerminateAllCalls don't work. - TName allCalls; - allCalls.Copy( KTerminateAllCalls ); - iCustomPhone.TerminateCall( aReqStatus, allCalls ); + iPhone.TerminateActiveCalls( aReqStatus ); + LOG( SIMPLE, "SATENGINE: CSatMultiModeApi::TerminateAllCalls exiting" ) } diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/SystemState/src/TSatSystemStateFactory.cpp --- a/satengine/SatServer/SystemState/src/TSatSystemStateFactory.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/SystemState/src/TSatSystemStateFactory.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -18,7 +18,8 @@ #include #include -#include +#define Q_OS_SYMBIAN // needed to activate homescreendomainpskeys.h +#include #include #include #include @@ -61,10 +62,10 @@ CreateIdleModeChangeNotifierL calling" ) MSatSystemStateChangeNotifier* ret = CSatPSChangeNotifier::NewL( - KPSUidAiInformation, - KActiveIdleState, + KHsCategoryUid, + KHsCategoryStateKey, aObserver, - EPSAiForeground ); + EHomeScreenIdleState ); LOG( SIMPLE, "SATSYSTEMSTATE: TSatSystemStateFactory::\ CreateIdleModeChangeNotifierL exiting" ) diff -r 7eb70891911c -r a2467631ae02 satengine/SatServer/inc/msatmultimodeapi.h --- a/satengine/SatServer/inc/msatmultimodeapi.h Fri Jun 11 14:07:16 2010 +0300 +++ b/satengine/SatServer/inc/msatmultimodeapi.h Wed Jun 23 18:49:32 2010 +0300 @@ -95,6 +95,12 @@ */ virtual void SendDTMFTones(TRequestStatus& aReqStatus, const TDesC& aTones) = 0; + + /** + * Access RMobilePhone::ContinueDTMFStringSending + * for the paramter information please see the etelmm.h + */ + virtual TInt ContinueDTMFStringSending( TBool aContinue ) = 0; /** * Access RMobilePhone::CancelAsyncRequest * for the paramter information please see the etelmm.h @@ -151,9 +157,9 @@ virtual void NotifyCallStatusChangeCancel() = 0; /** - * Access RMobilePhone::TerminateAllCalls + * Access RMobilePhone::TerminateActiveCalls */ - virtual void TerminateAllCalls(TRequestStatus& aReqStatus) = 0; + virtual void TerminateActiveCalls(TRequestStatus& aReqStatus) = 0; /** * Access RMboileCall::GetMobileCallInfo diff -r 7eb70891911c -r a2467631ae02 satengine/satserver/Commands/SetUpCallCmd/inc/csetupcalldtmfsender.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/satengine/satserver/Commands/SetUpCallCmd/inc/csetupcalldtmfsender.h Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,87 @@ +/* +* 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: Create the call and emergency call to ETelMM +* +*/ + + +#ifndef CSETUPCALLDTMFSENDER_H +#define CSETUPCALLDTMFSENDER_H + +#include +#include "msatmultimodeapi.h" + +NONSHARABLE_CLASS ( CSetupCallDtmfSender ) : public CActive +{ +public: + + /** + * Two-phased constructor. + * @param aPhone A reference to the MSatMultiModeApi. + * @return a pointer to the newly created object. + */ + static CSetupCallDtmfSender* NewL( MSatMultiModeApi& aPhone ); + + /** + * Destructor. + */ + virtual ~CSetupCallDtmfSender(); + + /** + * Send Dtmf string after creating a call successfully + */ + void SendDtmfString(); + + /** + * Separate Dtmf string from whole string. + * Purl tel number will return by aString. + * Dtmf string will store in data member for furture sending dtmf. + */ + void SeparateDtmfFromTelNumber( TDes& aString ); + +protected: + + /** + * From CActive, handles the request completion. + */ + void RunL(); + + /** + * From CActive, handle the request cancel + */ + void DoCancel(); + +private: + + /** + * C++ default constructor. + * @param aPhone A reference to MSatMultiModeApi. + */ + CSetupCallDtmfSender( MSatMultiModeApi& aPhone ); + +private: // Data + + /** + * Reference to the MSatMultiModeApi + */ + MSatMultiModeApi& iPhone; + + /** + * Own. Dtmf string + */ + HBufC* iDtmfString; + +}; + +#endif // CSETUPCALLDTMFSENDER_H diff -r 7eb70891911c -r a2467631ae02 satengine/satserver/Commands/SetUpCallCmd/src/csetupcalldtmfsender.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/satengine/satserver/Commands/SetUpCallCmd/src/csetupcalldtmfsender.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,199 @@ +/* +* 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: Send DTMF string if necessary after creating a call +* +*/ + +#include +#include +#include "csetupcalldtmfsender.h" +#include "msatasynctosync.h" +#include "SatLog.h" + +_LIT( KSatDtmfCharp, "p" ); +_LIT( KSatDtmfCharw, "w" ); + +// ================= MEMBER FUNCTIONS ======================= + +// ----------------------------------------------------------------------------- +// CSetupCallDtmfSender::CSetupCallDtmfSender +// The class constructor. +// ----------------------------------------------------------------------------- +// +CSetupCallDtmfSender::CSetupCallDtmfSender( MSatMultiModeApi& aPhone ) + : CActive( EPriorityStandard ), iPhone( aPhone ), iDtmfString( NULL ) + { + LOG( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::CSetupCallDtmfSender calling" ) + + CActiveScheduler::Add( this ); + + LOG( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::CSetupCallDtmfSender exiting" ) + } + +// ----------------------------------------------------------------------------- +// CSetupCallDtmfSender::NewL +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +CSetupCallDtmfSender* CSetupCallDtmfSender::NewL( MSatMultiModeApi& aPhone ) + { + LOG( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::NewL calling" ) + + CSetupCallDtmfSender* self = + new ( ELeave ) CSetupCallDtmfSender( aPhone ); + + LOG( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::NewL exiting" ) + return self; + } + +// ----------------------------------------------------------------------------- +// CSetupCallDtmfSender::~CSetupCallDtmfSender +// Destructor +// ----------------------------------------------------------------------------- +// +CSetupCallDtmfSender::~CSetupCallDtmfSender() + { + LOG( SIMPLE, "SETUPCALL: \ + CSetupCallDtmfSender::~CSetupCallDtmfSender calling" ) + Cancel(); + + delete iDtmfString; + iDtmfString = NULL; + + LOG( SIMPLE, "SETUPCALL: \ + CSetupCallDtmfSender::~CSetupCallDtmfSender exiting" ) + } + +// ----------------------------------------------------------------------------- +// CSetupCallDtmfSender::SendDtmfString +// ----------------------------------------------------------------------------- +// +void CSetupCallDtmfSender::SendDtmfString() +{ + LOG( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::SendDtmfString calling" ) + if( !IsActive() && iDtmfString ) + { + const TInt ret = iPhone.ContinueDTMFStringSending( ETrue ); + LOG2( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::SendDtmfString\ + ContinueDTMFStringSending ret %d", ret ) + iPhone.SendDTMFTones( iStatus, *iDtmfString ); + + SetActive(); + } + LOG( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::SendDtmfString exit" ) +} + +// ----------------------------------------------------------------------------- +// CSetupCallDtmfSender::SeparateDtmfFromTelNumber +// Refers to +// RPhCltEmergencyCall::RemoveDTMF +// RPhCltEmergencyCall::FindStartOfDtmfString +// ----------------------------------------------------------------------------- +// +void CSetupCallDtmfSender::SeparateDtmfFromTelNumber(TDes& aString) + { + LOG( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::SeparateDtmfFromTelNumber calling") + + delete iDtmfString; + iDtmfString = NULL; + + // String must contain 'p' or 'w'. Find start of dtmf string. + TInt indexp; //char 'p' index + TInt indexw; // char 'w' index + TPtrC ptrDtmfCharp( KSatDtmfCharp ); + TPtrC ptrDtmfCharw( KSatDtmfCharw ); + + indexp = aString.Locate( ptrDtmfCharp[ 0 ] ); + indexw = aString.Locate( ptrDtmfCharw[ 0 ] ); + + TInt dtmfIndex = KErrNotFound; + if ( indexp != KErrNotFound || indexw != KErrNotFound ) + { + // dtmf char found + if ( indexw == KErrNotFound ) + { + // char p index + dtmfIndex = indexp; + } + else if ( indexp == KErrNotFound ) + { + // char w index + dtmfIndex = indexw; + } + else + { + // Both chars p and w found, smaller index selected + indexp < indexw ? dtmfIndex = indexp : dtmfIndex = indexw; + } + } + LOG2( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::SeparateDtmfFromTelNumber \ + dtmfIndex=%d", dtmfIndex ) + + // Separate purl tel number and dtmf string + if ( dtmfIndex != KErrNotFound ) + { + // Dtmf string to member data for furture sending + TPtrC temp( aString.Right( aString.Length() - dtmfIndex ) ); + LOG2( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::SeparateDtmfFromTelNumber \ + DTMF=%S", &temp) + + iDtmfString = temp.Alloc(); + LOG2( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::SeparateDtmfFromTelNumber \ + iDtmfString address=%d", iDtmfString ) + + // Tel number for dialing call + aString.Delete( dtmfIndex, aString.Length() - dtmfIndex ); + LOG2( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::SeparateDtmfFromTelNumber \ + TelNumber=%S", &aString ) + } + LOG( SIMPLE, + "SETUPCALL: CSetupCallDtmfSender::SeparateDtmfFromTelNumber exit" ) + } + +// ----------------------------------------------------------------------------- +// CSetupCallDtmfSender::RunL +// Handles the command. +// ----------------------------------------------------------------------------- +// +void CSetupCallDtmfSender::RunL() + { + LOG2( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::RunL calling iStatus=%i", + iStatus.Int() ) + + delete iDtmfString; + iDtmfString = NULL; + + LOG( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::RunL exiting" ) + } + +// ----------------------------------------------------------------------------- +// From class CActive. +// Cancels the sat request. +// ----------------------------------------------------------------------------- +// +void CSetupCallDtmfSender::DoCancel() + { + LOG( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::DoCancel calling" ) + iPhone.CancelAsyncRequest( EMobilePhoneSendDTMFTones ); + LOG( SIMPLE, "SETUPCALL: CSetupCallDtmfSender::DoCancel exiting" ) + } + +// End of File diff -r 7eb70891911c -r a2467631ae02 satui/satapp/inc/satappcommonconstant.h --- a/satui/satapp/inc/satappcommonconstant.h Fri Jun 11 14:07:16 2010 +0300 +++ b/satui/satapp/inc/satappcommonconstant.h Wed Jun 23 18:49:32 2010 +0300 @@ -28,6 +28,7 @@ const unsigned int KGetInputStringMaxSize = 0xEF; const int KExtendTimeoutMseconds(3000); +// 1 minute const int KDefaultSelectionTimeoutMseconds(60000); const int KSymbianTimeConvertQtTime(100); const int KMoSmControlTimeOut(3000); diff -r 7eb70891911c -r a2467631ae02 satui/satapp/inc/satappgetinkeynote.h --- a/satui/satapp/inc/satappgetinkeynote.h Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +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 SATAPPGETINKEYNOTE_H -#define SATAPPGETINKEYNOTE_H - -#include -#include - - -class SatAppGetInkeyNote : public HbMessageBox -{ - Q_OBJECT - -public: - - SatAppGetInkeyNote(const QString &text, - MessageBoxType type=MessageTypeInformation, - QGraphicsItem *parent=0); - - virtual ~SatAppGetInkeyNote(); - -signals: - - void digitalKeyPressed(const int key); - -public: - void keyPressEvent(QKeyEvent *event); - - }; -#endif //SATAPPGETINKEYNOTE_H - diff -r 7eb70891911c -r a2467631ae02 satui/satapp/inc/satappuiprovider.h --- a/satui/satapp/inc/satappuiprovider.h Fri Jun 11 14:07:16 2010 +0300 +++ b/satui/satapp/inc/satappuiprovider.h Wed Jun 23 18:49:32 2010 +0300 @@ -29,7 +29,6 @@ class SatAppView; // SetupMenu and SelectItem class HbMessageBox; // DisplayText class HbDeviceMessageBox; // CallControl -class SatAppGetInkeyNote; // GetInKey class HbInputDialog; // GetInKey class QTimer; // For SMS/DTMF class HbProgressDialog; @@ -148,6 +147,7 @@ int showGetYesNoQuery( const QString &aText, const TSatCharacterSet aCharacterSet, + unsigned int &aInkey, unsigned int &aDuration, const bool aImmediateDigitResponse); @@ -260,11 +260,6 @@ void closeUi(); /* - * Digital response - */ - void digitalResponse(const int aKey); - - /* * The response of user selected the Primary action */ void userPrimaryResponse(); @@ -281,6 +276,14 @@ void updateQueryAction(QString text); /* + * Handle HbLineEdit contentsChanged signal. + * when the input dialog in the password mode + * there is no textChanged signal, get this from + * HbAbstractEdit + */ + void contentChanged(); + + /* * User cancel response, Send DTMF, Send Data, Receive Data */ void cancelResponse(); @@ -304,6 +307,11 @@ const QString &aText, bool &aActionAccepted); + /* + * handleImmediateCancel + */ + void handleImmediateCancel(); + private: /* * Reset the data member mUserRsp value @@ -326,6 +334,12 @@ * Extend the note shown time */ void extendNoteShowtime(); + + /* + * Digital immediately response + * @param text + */ + void immediateResponse(QString text); private: /* @@ -366,7 +380,12 @@ /* * Own. YesNoPopup */ - SatAppGetInkeyNote *mYesNoPopup; + HbMessageBox *mYesNoPopup; + + /* + * Own. Get inkey immediately response query dialog + */ + HbInputDialog *mImmediateQuery; /* * Own. GetInputQuery @@ -401,7 +420,7 @@ /* * GetInkey immediate digital response */ - int mDigitalRsp; + unsigned int mDigitalRsp; /* * GetInput min legnth, en/dis able ok buttion diff -r 7eb70891911c -r a2467631ae02 satui/satapp/rom/satapp.iby --- a/satui/satapp/rom/satapp.iby Fri Jun 11 14:07:16 2010 +0300 +++ b/satui/satapp/rom/satapp.iby Wed Jun 23 18:49:32 2010 +0300 @@ -1,19 +1,19 @@ -; -; 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: IBY file for satapp application -; -; +/* +* 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: IBY file for satapp application +* +*/ #ifndef __SATAPP_IBY__ #define __SATAPP_IBY__ diff -r 7eb70891911c -r a2467631ae02 satui/satapp/satapp.pro --- a/satui/satapp/satapp.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/satui/satapp/satapp.pro Wed Jun 23 18:49:32 2010 +0300 @@ -26,21 +26,26 @@ ICON = resource/qtg_large_sat.svg symbian: { - TARGET.CAPABILITY = CAP_GENERAL_DLL + TARGET.CAPABILITY = CAP_APPLICATION NetworkControl TARGET.UID3=0x101f4ce0 +} + + INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \ .inc\ MOC_DIR \ ../../inc - LIBS += -lSatClient.dll \ - -lSatInternalClient.dll \ - -legul.dll \ - -lfbscli.dll \ - -lcentralrepository.dll \ - -lCenRepNotifHandler.dll \ - -lCdlEngine.dll \ - -lFlogger.dll \ - -lprofileeng.dll + + LIBS += -lSatClient \ + -lSatInternalClient \ + -legul \ + -lfbscli \ + -lcentralrepository \ + -lCenRepNotifHandler \ + -lCdlEngine \ + -lmediaclientaudio \ + -lFlogger \ + -lprofileeng HEADERS += inc/msatuiactionimplementer.h \ inc/satappcommonconstant.h \ @@ -50,7 +55,6 @@ inc/satappeventprovider.h \ inc/satappuiprovider.h \ inc/satappview.h \ - inc/satappgetinkeynote.h \ inc/csatuiobserver.h \ inc/csatuiiconhandler.h \ inc/satappplaytoneprovider.h \ @@ -62,7 +66,6 @@ src/satappeventprovider.cpp \ src/satappuiprovider.cpp \ src/satappview.cpp \ - src/satappgetinkeynote.cpp \ src/csatuiobserver.cpp \ src/csatuiiconhandler.cpp \ src/satappplaytoneprovider.cpp \ @@ -72,7 +75,6 @@ "rom/satapp_stub.sis /epoc32/data/z/system/install/satapp_stub.sis" \ "resource/satapp_en.ts /epoc32/include/platform/qt/translations/satapp_en.ts" -} RESOURCES += resource/satapp.qrc diff -r 7eb70891911c -r a2467631ae02 satui/satapp/src/satappcommandhandler.cpp --- a/satui/satapp/src/satappcommandhandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satui/satapp/src/satappcommandhandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -127,13 +127,14 @@ "SATAPP: SatAppCommandHandler::displayText duration given") duration = aDuration * 1000; } - + // If not sustained or Clear after delay requested start timer if ( !(!aSustainedText || aDuration || !aWaitUserToClear) ){ TFLOGSTRING( "SATAPP: SatAppCommandHandler::displayText no duration") duration = 0; } + TFLOGSTRING2( "SATAPP: SatAppCommandHandler::displayText duration: %d", duration) @@ -188,9 +189,11 @@ // the timeout expires The timer starts when the text is //displayed on the screen and stops when the TERMINALRESPONSE is sent. QTime time; + unsigned int duration = KDefaultSelectionTimeoutMseconds; if (aDuration) { TFLOGSTRING2("SATAPP: SatAppCommandHandler::getInkey\ in aDuration: %d", aDuration) + duration = aDuration * KSymbianTimeConvertQtTime; time.start(); } @@ -210,7 +213,7 @@ } //Duration will be implemented in GetInkey proactive command TSatAppUserResponse rsp = EUserNoResponse; - rsp = mUi.showGetInkeyQuery(heading, aInputText, aCharacterSet, aDuration); + rsp = mUi.showGetInkeyQuery(heading, aInputText, aCharacterSet, duration); if (aDuration) { aDuration = time.elapsed() / KSymbianTimeConvertQtTime; @@ -256,30 +259,50 @@ // the timeout expires The timer starts when the text is //displayed on the screen and stops when the TERMINALRESPONSE is sent. QTime time; + unsigned int duration = KDefaultSelectionTimeoutMseconds; if (aDuration) { TFLOGSTRING2("SATAPP: SatAppUiProvider::getYesNo in aDuration: %d", aDuration) + duration = aDuration * KSymbianTimeConvertQtTime; time.start(); } + TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration=%d", + duration) aRes = ESatSuccess; int rsp = -1; - rsp = mUi.showGetYesNoQuery(aText, aCharacterSet, - aDuration, aImmediateDigitResponse); - // User press OK key + unsigned int inKey = aInkey; + rsp = mUi.showGetYesNoQuery(aText, aCharacterSet, inKey, + duration, aImmediateDigitResponse); + + if (aDuration) { + aDuration = time.elapsed() / KSymbianTimeConvertQtTime; + } + TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration out=%d", + aDuration) if (EUserPrimaryResponse == rsp) { aRes = ESatSuccess; - aInkey = 1; + if ( Qt::Key_unknown == inKey ) { + // User press yes key + aInkey = 1; + } else { + // User press digital key + aInkey = inKey; + } TFLOGSTRING("SATAPP: SatAppCommandHandler::getYesNo successful response") } else if (EUserSecondaryResponse == rsp) { - // User press NO key - aRes = ESatSuccess; - aInkey = 0; - TFLOGSTRING("SATAPP: SatAppCommandHandler::getYesNo No request by user") - } else if (ESatYesNo != aCharacterSet && !rsp) { - aRes = ESatSuccess; - } + // User press cancel in immediate digital mode + if (ESatYesNo != aCharacterSet) { + aRes = ESatBackwardModeRequestedByUser; + TFLOGSTRING("SATAPP: SatAppCommandHandler::getYesNo Cancel") + } else { + // User press NO key + aRes = ESatSuccess; + aInkey = 0; + TFLOGSTRING("SATAPP: SatAppCommandHandler::getYesNo No") + } + } // else if { // // User press end/back key // aRes = ESatBackwardModeRequestedByUser; diff -r 7eb70891911c -r a2467631ae02 satui/satapp/src/satappeventprovider.cpp --- a/satui/satapp/src/satappeventprovider.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satui/satapp/src/satappeventprovider.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -413,7 +413,7 @@ immediateDigitResponse); aInkey = inKey; - TFLOGSTRING2("SATAPP: SatAppEventProvider::GetYesNoL key=%d", inKey) + TFLOGSTRING2("SATAPP: SatAppEventProvider::GetYesNoL key=%x", inKey) TFLOGSTRING("SATAPP: SatAppEventProvider::GetYesNoL exit") return response; } @@ -681,6 +681,10 @@ } bool actionAccepted = aActionAccepted; emit showOpenChannelConfirmEvent(title, actionAccepted); + // Show progress dialog when Openchannel confirmed + if( actionAccepted ) { + emit showWaitNoteWithoutDelayEvent(); + } aActionAccepted = actionAccepted; TFLOGSTRING2( "SATAPP: SatAppEventProvider::ConfirmOpenChannelL exit\ response: %d", response) diff -r 7eb70891911c -r a2467631ae02 satui/satapp/src/satappgetinkeynote.cpp --- a/satui/satapp/src/satappgetinkeynote.cpp Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -/* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -* -*/ - -#include "tflogger.h" -#include "satappgetinkeynote.h" - -// ======== MEMBER FUNCTIONS ================================================== - -// ---------------------------------------------------------------------------- -// SatAppGetInkeyNote::SatAppGetInkeyNote -// (Constructor). -// ---------------------------------------------------------------------------- -// -SatAppGetInkeyNote::SatAppGetInkeyNote(const QString &text, - MessageBoxType type, QGraphicsItem *parent): - HbMessageBox(text, type, parent) -{ - TFLOGSTRING("SATAPP: SatAppGetInkeyNote::SatAppGetInkeyNote call - exit") -} - -// ---------------------------------------------------------------------------- -// SatAppGetInkeyNote::~SatAppGetInkeyNote -// (Destructor). -// ---------------------------------------------------------------------------- -// -SatAppGetInkeyNote::~SatAppGetInkeyNote() -{ - TFLOGSTRING("SATAPP: SatAppGetInkeyNote::~SatAppGetInkeyNote call - exit") -} - - -// ---------------------------------------------------------------------------- -// SatAppGetInkeyNote::keyPressEvent -// (keyPressEvent). -// ---------------------------------------------------------------------------- -// -void SatAppGetInkeyNote::keyPressEvent(QKeyEvent *event) -{ - TFLOGSTRING("SATAPP: SatAppGetInkeyNote::keyPressEvent") - switch (event->key()) - { - case Qt::Key_0: - case Qt::Key_1: - case Qt::Key_2: - case Qt::Key_3: - case Qt::Key_4: - case Qt::Key_5: - case Qt::Key_6: - case Qt::Key_7: - case Qt::Key_8: - case Qt::Key_9: - case Qt::Key_Plus: - case Qt::Key_Asterisk: - case Qt::Key_NumberSign: - { - TFLOGSTRING("SATAPP: SatAppGetInkeyNote::keyPressEvent digits key") - emit digitalKeyPressed(event->key()); - } - break; - default : - { - HbMessageBox::keyPressEvent(event); - break; - } - } - TFLOGSTRING2("SATAPP: SatAppGetInkeyNote::keyPressEvent key %d", \ - event->key()) - TFLOGSTRING("SATAPP: SatAppGetInkeyNote::keyPressEvent exit") -} - -//End of file diff -r 7eb70891911c -r a2467631ae02 satui/satapp/src/satappuiprovider.cpp --- a/satui/satapp/src/satappuiprovider.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/satui/satapp/src/satappuiprovider.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -32,7 +32,6 @@ #include #include #include "satappview.h" // SetUpMenu, SelectItem -#include "satappgetinkeynote.h" // GetYesNo immediate digit response #include "satappuiprovider.h" #include "tflogger.h" @@ -41,7 +40,7 @@ const char *SATAPP_SELECTITEM_VIEW = "selectitem_view"; // ======== MEMBER FUNCTIONS ================================================== -// TODO: #ifndef _DEBUG need to be remove when orbit works well. Now the macro +// TODO: #ifndef __WINS__ need to be remove when orbit works well. Now the macro // is to avoid panic on emulator. Deleting pointer before create dialog is to // avoid memory leak in emulator. @@ -55,7 +54,7 @@ QObject *parent) : QObject(parent), mMainWindow(window), mLoader(0), mSetupMenuView(0), mSelectItemView(0), mDisplayPopup(0), - mGetInkeyQuery(0), mYesNoPopup(0), mGetInputQuery(0), + mGetInkeyQuery(0),mYesNoPopup(0), mImmediateQuery(0), mGetInputQuery(0), mConfirmSendQuery(0), mSetUpCallQuery(0), mCallControlMsg(0), mConfirmBipQuery(0), mUserRsp(EUserNoResponse), mDigitalRsp(0), mMinLength(0), mTimer(0), mLoop(0),mWaitNote(0) @@ -126,18 +125,26 @@ "SATAPP: SatAppUiProvider::~SatAppUiProvider object tree"); delete mObjects.takeFirst(); } + if (mDisplayPopup) { delete mDisplayPopup; mDisplayPopup = 0; } + if (mGetInkeyQuery) { delete mGetInkeyQuery; mGetInkeyQuery = 0; } + if (mYesNoPopup) { delete mYesNoPopup; mYesNoPopup = 0; } + + if (mImmediateQuery) { + delete mImmediateQuery; + mImmediateQuery = 0; + } if (mGetInputQuery) { delete mGetInputQuery; mGetInputQuery = 0; @@ -271,9 +278,10 @@ if (mDisplayPopup){ delete mDisplayPopup; - mDisplayPopup = NULL; + mDisplayPopup = NULL; } mDisplayPopup = new HbMessageBox(HbMessageBox::MessageTypeInformation); + if (mDisplayPopup) { TFLOGSTRING( "SATAPP: SatAppUiProvider::showDisplayTextPopup note created") @@ -291,11 +299,10 @@ waiter.wait(); TFLOGSTRING( "SATAPP: SatAppUiProvider::showDisplayTextPopup duration end open") - -#ifndef _DEBUG +#ifndef __WINS__ delete mDisplayPopup; mDisplayPopup = 0; -#endif +#endif } TFLOGSTRING("SATAPP: SatAppUiProvider::showDisplayTextPopup exit") return mUserRsp; @@ -318,7 +325,7 @@ if (mGetInkeyQuery){ delete mGetInkeyQuery; - mGetInkeyQuery = NULL; + mGetInkeyQuery = NULL; } mGetInkeyQuery = new HbInputDialog(); if (mGetInkeyQuery) { @@ -337,12 +344,7 @@ // char mode inputMode.setUpAsLatinAlphabetOnlyEditor(); } - - unsigned int duration = KDefaultSelectionTimeoutMseconds; - if (aDuration) { - duration = aDuration * KSymbianTimeConvertQtTime; - } - composeDialog(mGetInkeyQuery, duration, ESatDialogGetInkey); + composeDialog(mGetInkeyQuery, aDuration, ESatDialogGetInkey); mGetInkeyQuery->lineEdit()->setMaxLength(1); connect(mGetInkeyQuery->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(updateQueryAction(QString))); @@ -355,10 +357,10 @@ QString inputString = (mGetInkeyQuery->value()).toString(); aContent = inputString; -#ifndef _DEBUG +#ifndef __WINS__ delete mGetInkeyQuery; mGetInkeyQuery = 0; -#endif +#endif } TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInkeyQuery exit") return mUserRsp; @@ -371,6 +373,7 @@ int SatAppUiProvider::showGetYesNoQuery( const QString &aText, const TSatCharacterSet aCharacterSet, + unsigned int &aInkey, unsigned int &aDuration, const bool aImmediateDigitResponse) { @@ -379,62 +382,81 @@ stopShowWaitNote(); TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration in=%d", aDuration) - unsigned int duration = KDefaultSelectionTimeoutMseconds; - if (aDuration) { - duration = aDuration * KSymbianTimeConvertQtTime; - } - TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration=%d", - duration) - - if (mYesNoPopup){ - delete mYesNoPopup; - mYesNoPopup = NULL; - } - if (ESatYesNo == aCharacterSet) { - mYesNoPopup = new SatAppGetInkeyNote(aText); - TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery normal") - composeDialog(mYesNoPopup, duration, ESatDialogGetYesNo); - } else if (aImmediateDigitResponse){ - // user can choose the charactor or digital , and only cancel - // key press, then close current dialog - mYesNoPopup = new SatAppGetInkeyNote(aText); - composeDialog(mYesNoPopup, duration, ESatDialogGetDigitalRsp); + if (mYesNoPopup){ + delete mYesNoPopup; + mYesNoPopup = 0; + } + mYesNoPopup = new HbMessageBox(HbMessageBox::MessageTypeInformation); + + if (mYesNoPopup) { + TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery normal") + // Set the label as heading widget + HbLabel *lHeading = new HbLabel(aText, mYesNoPopup); + mYesNoPopup->setHeadingWidget(lHeading); + mYesNoPopup->setIconVisible(false); + + composeDialog(mYesNoPopup, aDuration, ESatDialogGetYesNo); - TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery immediate") - bool ret = connect(mYesNoPopup, SIGNAL(digitalKeyPressed(int)), - this, SLOT(digitalResponse(int)), - Qt::DirectConnection); - TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery:\ - digitalKeyPressed=%d", ret) + TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery before open") + DialogWaiter waiter; + mYesNoPopup->open(&waiter, SLOT(done(HbAction *))); + waiter.wait(); + TFLOGSTRING( "SATAPP: SatAppUiProvider::showGetYesNoQuery after open") + mYesNoPopup->close(); + } + } else if (aImmediateDigitResponse) { + if (mImmediateQuery) { + delete mImmediateQuery; + mImmediateQuery = 0; + } + mImmediateQuery = new HbInputDialog(); + if (mImmediateQuery) { + mImmediateQuery->setPromptText(aText); + // user can choose the charactor or digital , and only cancel + // key press, then close current dialog + TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery immediate") + composeDialog(mImmediateQuery, aDuration, ESatDialogGetDigitalRsp); + bool ret = connect(mImmediateQuery->lineEdit(), + SIGNAL(textChanged(QString)), + this, SLOT(updateQueryAction(QString))); + TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery:\ + connect updateQueryAction=%d", ret) + // digit mode, digits only (0 9, *, #, and +) + HbEditorInterface inputMode(mImmediateQuery->lineEdit()); + inputMode.setFilter(HbPhoneNumberFilter::instance()); + if (mLoop) { + TFLOGSTRING("SatAppUiProvider::showGetYesNoQuery delete loop") + delete mLoop; + mLoop = 0; + } + if (mTimer) { + delete mTimer; + mTimer = 0; + TFLOGSTRING("SatAppUiProvider::showGetYesNoQuery delete timer") + } + mTimer = new QTimer(this); + mTimer->start(aDuration); + ret = connect(mTimer, SIGNAL(timeout()), mTimer, SLOT(stop())); + TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery connect\ + mTimer stop: %d", ret) + mLoop = new QEventLoop(this); + ret = connect(mTimer, SIGNAL(timeout()), mLoop, SLOT(quit())); + TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery befor pop") + mImmediateQuery->open(); + mLoop->exec(); + TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery end pop") + if (mTimer->isActive()) { + TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery stop time") + mTimer->stop(); + } + aInkey = mDigitalRsp; + mImmediateQuery->close(); + } } - if (mYesNoPopup) { - TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration=%d", - aDuration) - QTime time; - time.start(); - - TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery befor pop") - DialogWaiter waiter; - mYesNoPopup->open(&waiter, SLOT(done(HbAction *))); - waiter.wait(); - TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery end pop") - aDuration = time.elapsed() / KSymbianTimeConvertQtTime; - TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration out=%d", - aDuration) -#ifndef _DEBUG - delete mYesNoPopup; - mYesNoPopup = 0; -#endif - } - if (ESatYesNo == aCharacterSet) { - mDigitalRsp = mUserRsp; - TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery:yes/no rsp") - } - return mDigitalRsp; + return mUserRsp; } - // ---------------------------------------------------------------------------- // showGetInputQuery // ---------------------------------------------------------------------------- @@ -456,7 +478,7 @@ if (mGetInputQuery){ delete mGetInputQuery; - mGetInputQuery = NULL; + mGetInputQuery = NULL; } mGetInputQuery = new HbInputDialog(); mGetInputQuery->setPromptText(heading); @@ -471,8 +493,7 @@ // char mode inputMode.setUpAsLatinAlphabetOnlyEditor(); } - connect(mGetInputQuery->lineEdit(), SIGNAL(textChanged(QString)), - this, SLOT(updateQueryAction(QString))); + mGetInputQuery->lineEdit()->setMaxLength(maxLength); composeDialog(mGetInputQuery, KDefaultSelectionTimeoutMseconds, ESatDialogGetInput); @@ -484,7 +505,14 @@ if (aHideInput) { mGetInputQuery->lineEdit()->setEchoMode(HbLineEdit::Password); - TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInputQuery hide") + + bool res = connect(mGetInputQuery->lineEdit(), + SIGNAL(contentsChanged()), this, SLOT(contentChanged())); + TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetInputQuery \ + connect %d",res); + }else { + connect(mGetInputQuery->lineEdit(), SIGNAL(textChanged(QString)), + this, SLOT(updateQueryAction(QString))); } TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInputQuery before pop") @@ -495,10 +523,10 @@ content = (mGetInputQuery->value()).toString(); -#ifndef _DEBUG +#ifndef __WINS__ delete mGetInputQuery; mGetInputQuery = 0; -#endif +#endif TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetInputQuery mUserRsp =%d exit", mUserRsp) @@ -506,6 +534,19 @@ } // ---------------------------------------------------------------------------- +// SatAppInputProvider::contentChanged +// Called when editor field is modified +// ---------------------------------------------------------------------------- +// +void SatAppUiProvider::contentChanged() +{ + if (mGetInputQuery) { + QString content = (mGetInputQuery->value()).toString(); + updateQueryAction(content); + } +} + +// ---------------------------------------------------------------------------- // Called when editor field is modified // ---------------------------------------------------------------------------- // @@ -520,7 +561,7 @@ mGetInputQuery->actions().at(0)->setEnabled(false); } } - + // Get InKey if (mGetInkeyQuery && mGetInkeyQuery->actions().at(0)) { if (1 == text.length()) { @@ -529,7 +570,11 @@ mGetInkeyQuery->actions().at(0)->setEnabled(false); } } - + if (mImmediateQuery) { + TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction \ + digital immediate") + immediateResponse(text); + } TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction exit") } @@ -546,12 +591,11 @@ if (mConfirmSendQuery){ delete mConfirmSendQuery; - mConfirmSendQuery = NULL; + mConfirmSendQuery = NULL; } - mConfirmSendQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion); if(mConfirmSendQuery) { - mConfirmSendQuery->setText(aText); + mConfirmSendQuery->setText(aText); composeDialog(mConfirmSendQuery, 0, ESatDialogConfirmSend); TFLOGSTRING("SATAPP: SatAppUiProvider::confirmSend before open") @@ -560,10 +604,10 @@ waiter.wait(); TFLOGSTRING("SATAPP: SatAppUiProvider::confirmSend after open") -#ifndef _DEBUG +#ifndef __WINS__ delete mConfirmSendQuery; mConfirmSendQuery = 0; -#endif +#endif } aActionAccepted = (EUserPrimaryResponse == mUserRsp) ? true : false; TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSendQuery exit") @@ -678,7 +722,6 @@ alphaId.append(aText); TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSetUpCallQUery exit") } - if (mSetUpCallQuery){ delete mSetUpCallQuery; mSetUpCallQuery = NULL; @@ -686,8 +729,7 @@ mSetUpCallQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion); if(mSetUpCallQuery) { - mSetUpCallQuery->setText(alphaId); - + mSetUpCallQuery->setText(alphaId); composeDialog(mSetUpCallQuery, 0, ESatDialogSetUpCall); TFLOGSTRING("SATAPP: SatAppSetUpCall::showSetUpCallConfirm before open") @@ -696,10 +738,10 @@ waiter.wait(); TFLOGSTRING("SATAPP: SatAppSetUpCall::showSetUpCallConfirm after open") -#ifndef _DEBUG +#ifndef __WINS__ delete mSetUpCallQuery; mSetUpCallQuery = 0; -#endif +#endif } aActionAccepted = (EUserPrimaryResponse == mUserRsp) ? true : false; TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSetUpCallQUery exit") @@ -713,49 +755,63 @@ { TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen called") if (mDisplayPopup) { + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen DisplayText") mDisplayPopup->close(); mDisplayPopup = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen DisplayText") } if (mGetInkeyQuery) { + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen GetInkey") mGetInkeyQuery->close(); mGetInkeyQuery = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen GetInkey") } + if (mYesNoPopup) { + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen mYesNoPopup") mYesNoPopup->close(); - mYesNoPopup = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen GetYesNo") + delete mYesNoPopup; + mYesNoPopup = 0; } + + if (mImmediateQuery) { + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen mImmediateQuery") + mImmediateQuery->close(); + mImmediateQuery = NULL; + } + if (mGetInputQuery) { + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen GetInput") mGetInputQuery->close(); mGetInputQuery = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen GetInput") } + if(mConfirmSendQuery) { + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen ConfirmSend") mConfirmSendQuery->close(); mConfirmSendQuery = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen ConfirmSend") } + if (mSetUpCallQuery) { + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen SetUpCall") mSetUpCallQuery->close(); mSetUpCallQuery = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen SetUpCall") } + if (mCallControlMsg){ + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen CallControlMsg") mCallControlMsg->close(); mCallControlMsg = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen CallControlMsg") } + if (mConfirmBipQuery){ + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen ConfirmBip") mConfirmBipQuery->close(); mConfirmBipQuery = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen ConfirmBip") } + if (mWaitNote){ + TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen WaitNote") mWaitNote->close(); mWaitNote = NULL; - TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen WaitNote") } mUserRsp = EUserClearResponse; TFLOGSTRING("SATAPP: SatAppUiProvider::clearScreen exit") @@ -775,21 +831,6 @@ } // ---------------------------------------------------------------------------- -// digitalResponse -// ---------------------------------------------------------------------------- -// -void SatAppUiProvider::digitalResponse(const int aKey) -{ - TFLOGSTRING("SATAPP: SatAppGetInkey::digitalResponse call") - mDigitalRsp = aKey; - if (mYesNoPopup){ - TFLOGSTRING("SATAPP: SatAppUiProvider::digitalResponse Close") - mYesNoPopup->close(); - } - TFLOGSTRING("SATAPP: SatAppUiProvider::digitalResponse exit") -} - -// ---------------------------------------------------------------------------- // resetUserResponse // ---------------------------------------------------------------------------- // @@ -797,7 +838,7 @@ { TFLOGSTRING("SATAPP: SatAppUiProvider::resetUserResponse call") mUserRsp = EUserNoResponse; - mDigitalRsp = 0; + mDigitalRsp = Qt::Key_unknown; mMinLength = 0; TFLOGSTRING("SATAPP: SatAppUiProvider::resetUserResponse exit") } @@ -836,7 +877,7 @@ ret = connect(secondaryAction, SIGNAL(triggered()), this, SLOT(userSecondaryResponse())); TFLOGSTRING2("SATAPP: SatAppUiProvider::composeDialog \ - secondaryAction=%d", ret) + secondaryAction=%d", ret) if (ESatDialogDisplayText == type){ primaryAction->setText(hbTrId("txt_sat_general_ok")); @@ -863,6 +904,10 @@ } else if (ESatDialogGetDigitalRsp == type){ dlg->removeAction(primaryAction); secondaryAction->setText(hbTrId("txt_sat_general_cancel")); + ret = connect(secondaryAction, SIGNAL(triggered()), + this, SLOT(handleImmediateCancel())); + TFLOGSTRING2("SATAPP: SatAppUiProvider::composeDialog \ + con secondaryAction=%d", ret) TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \ ESatDialogGetDigitalRsp") } else if (ESatDialogSetUpCall == type){ @@ -1042,6 +1087,11 @@ bool &aActionAccepted) { TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmOpenChannelQuery call") + stopShowWaitNote(); + if (mConfirmBipQuery){ + delete mConfirmBipQuery; + mConfirmBipQuery = NULL; + } QString title = aText; if (!aText.length()){ title = hbTrId("txt_sat_openchannel_confirm_note"); @@ -1157,4 +1207,77 @@ TFLOGSTRING("SATAPP: SatAppUiProvider::showSatInfoNote exit") } + +// ---------------------------------------------------------------------------- +//handleImmediateCancel +// +// ---------------------------------------------------------------------------- +// +void SatAppUiProvider::handleImmediateCancel() +{ + TFLOGSTRING("SATAPP: SatAppUiProvider::handleImmediateCancel") + if (mLoop && mLoop->isRunning()) { + mLoop->quit(); + } + TFLOGSTRING("SATAPP: SatAppUiProvider::handleImmediateCancel exit") +} + +// ---------------------------------------------------------------------------- +//immediateResponse +// +// ---------------------------------------------------------------------------- +// +void SatAppUiProvider::immediateResponse(QString text) +{ + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse") + if (mLoop && mLoop->isRunning()) { + mLoop->quit(); + } + if ("0" == text) { + mDigitalRsp = Qt::Key_0; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 0") + } else if ("1" == text) { + mDigitalRsp = Qt::Key_1; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 1") + } else if ("2" == text) { + mDigitalRsp = Qt::Key_2; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 2") + } else if ("3" == text) { + mDigitalRsp = Qt::Key_3; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 3") + } else if ("4" == text) { + mDigitalRsp = Qt::Key_4; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 4") + }else if ("5" == text) { + mDigitalRsp = Qt::Key_5; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 5") + } else if ("6" == text) { + mDigitalRsp = Qt::Key_6; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 6") + } else if ("7" == text) { + mDigitalRsp = Qt::Key_7; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 7") + } else if ("8" == text) { + mDigitalRsp = Qt::Key_8; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 8") + } else if ("9" == text) { + mDigitalRsp = Qt::Key_9; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse 9") + } else if ("+" == text) { + mDigitalRsp = Qt::Key_Plus; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse +") + } else if ("*" == text) { + mDigitalRsp = Qt::Key_Asterisk; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse *") + } else if ("#" == text) { + mDigitalRsp = Qt::Key_NumberSign; + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse #") + } + mUserRsp = EUserPrimaryResponse; + TFLOGSTRING2("SATAPP: SatAppUiProvider::immediateResponse key %x", + mDigitalRsp) + + TFLOGSTRING("SATAPP: SatAppUiProvider::immediateResponse exit") +} + // End of file diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/bwins/dialpadu.def --- a/telutils/dialpad/bwins/dialpadu.def Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/bwins/dialpadu.def Wed Jun 23 18:49:32 2010 +0300 @@ -1,65 +1,63 @@ EXPORTS - ?initialize@Dialpad@@AAEXXZ @ 1 NONAME ; void Dialpad::initialize(void) - ?closeEvent@Dialpad@@MAEXPAVQCloseEvent@@@Z @ 2 NONAME ; void Dialpad::closeEvent(class QCloseEvent *) - ?trUtf8@DialpadKeyHandler@@SA?AVQString@@PBD0H@Z @ 3 NONAME ; class QString DialpadKeyHandler::trUtf8(char const *, char const *, int) - ?openAnimValueChanged@Dialpad@@IAEXM@Z @ 4 NONAME ; void Dialpad::openAnimValueChanged(float) - ?getStaticMetaObject@DialpadKeyHandler@@SAABUQMetaObject@@XZ @ 5 NONAME ; struct QMetaObject const & DialpadKeyHandler::getStaticMetaObject(void) - ?handleSceneEvent@Dialpad@@IAE_NPAVQEvent@@@Z @ 6 NONAME ; bool Dialpad::handleSceneEvent(class QEvent *) - ?showEvent@Dialpad@@MAEXPAVQShowEvent@@@Z @ 7 NONAME ; void Dialpad::showEvent(class QShowEvent *) - ?metaObject@Dialpad@@UBEPBUQMetaObject@@XZ @ 8 NONAME ; struct QMetaObject const * Dialpad::metaObject(void) const - ?staticMetaObject@Dialpad@@2UQMetaObject@@B @ 9 NONAME ; struct QMetaObject const Dialpad::staticMetaObject - ??1Dialpad@@UAE@XZ @ 10 NONAME ; Dialpad::~Dialpad(void) - ?setTapOutsideDismiss@Dialpad@@QAEX_N@Z @ 11 NONAME ; void Dialpad::setTapOutsideDismiss(bool) - ?getStaticMetaObject@Dialpad@@SAABUQMetaObject@@XZ @ 12 NONAME ; struct QMetaObject const & Dialpad::getStaticMetaObject(void) - ?trUtf8@DialpadKeyHandler@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString DialpadKeyHandler::trUtf8(char const *, char const *) - ?paint@Dialpad@@MAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 14 NONAME ; void Dialpad::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) - ?layoutBackgroundItem@Dialpad@@AAEXXZ @ 15 NONAME ; void Dialpad::layoutBackgroundItem(void) - ?updateLayout@Dialpad@@AAEXW4Orientation@Qt@@@Z @ 16 NONAME ; void Dialpad::updateLayout(enum Qt::Orientation) - ?openAnimFinished@Dialpad@@IAEXXZ @ 17 NONAME ; void Dialpad::openAnimFinished(void) - ?setCallButtonEnabled@Dialpad@@QAEX_N@Z @ 18 NONAME ; void Dialpad::setCallButtonEnabled(bool) - ?startCloseAnimation@Dialpad@@AAEXXZ @ 19 NONAME ; void Dialpad::startCloseAnimation(void) - ?closeDialpad@Dialpad@@QAEXXZ @ 20 NONAME ; void Dialpad::closeDialpad(void) - ?aboutToClose@Dialpad@@IAEXXZ @ 21 NONAME ; void Dialpad::aboutToClose(void) - ?qt_metacast@DialpadKeyHandler@@UAEPAXPBD@Z @ 22 NONAME ; void * DialpadKeyHandler::qt_metacast(char const *) - ??0Dialpad@@QAE@ABVHbMainWindow@@@Z @ 23 NONAME ; Dialpad::Dialpad(class HbMainWindow const &) - ?trUtf8@Dialpad@@SA?AVQString@@PBD0H@Z @ 24 NONAME ; class QString Dialpad::trUtf8(char const *, char const *, int) - ?closeAnimValueChanged@Dialpad@@IAEXM@Z @ 25 NONAME ; void Dialpad::closeAnimValueChanged(float) - ?qt_metacast@Dialpad@@UAEPAXPBD@Z @ 26 NONAME ; void * Dialpad::qt_metacast(char const *) - ?tr@DialpadKeyHandler@@SA?AVQString@@PBD0@Z @ 27 NONAME ; class QString DialpadKeyHandler::tr(char const *, char const *) - ??0Dialpad@@QAE@XZ @ 28 NONAME ; Dialpad::Dialpad(void) - ?openDialpad@Dialpad@@QAEXXZ @ 29 NONAME ; void Dialpad::openDialpad(void) - ?sceneEvent@Dialpad@@MAE_NPAVQEvent@@@Z @ 30 NONAME ; bool Dialpad::sceneEvent(class QEvent *) - ?staticMetaObject@DialpadKeyHandler@@2UQMetaObject@@B @ 31 NONAME ; struct QMetaObject const DialpadKeyHandler::staticMetaObject - ??1DialpadKeyHandler@@UAE@XZ @ 32 NONAME ; DialpadKeyHandler::~DialpadKeyHandler(void) - ?orientationChangeFinished@Dialpad@@IAEXW4Orientation@Qt@@@Z @ 33 NONAME ; void Dialpad::orientationChangeFinished(enum Qt::Orientation) - ?qt_metacall@DialpadKeyHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 34 NONAME ; int DialpadKeyHandler::qt_metacall(enum QMetaObject::Call, int, void * *) - ?hideEvent@Dialpad@@MAEXPAVQHideEvent@@@Z @ 35 NONAME ; void Dialpad::hideEvent(class QHideEvent *) - ?tr@Dialpad@@SA?AVQString@@PBD0@Z @ 36 NONAME ; class QString Dialpad::tr(char const *, char const *) - ?orientationChangeStarted@Dialpad@@IAEXXZ @ 37 NONAME ; void Dialpad::orientationChangeStarted(void) - ?trUtf8@Dialpad@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString Dialpad::trUtf8(char const *, char const *) - ?tr@DialpadKeyHandler@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString DialpadKeyHandler::tr(char const *, char const *, int) - ?qt_metacall@Dialpad@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 40 NONAME ; int Dialpad::qt_metacall(enum QMetaObject::Call, int, void * *) - ?tr@Dialpad@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString Dialpad::tr(char const *, char const *, int) - ?sceneEventFilter@Dialpad@@MAE_NPAVQGraphicsItem@@PAVQEvent@@@Z @ 42 NONAME ; bool Dialpad::sceneEventFilter(class QGraphicsItem *, class QEvent *) - ??_EDialpadKeyHandler@@UAE@I@Z @ 43 NONAME ; DialpadKeyHandler::~DialpadKeyHandler(unsigned int) - ?editor@Dialpad@@QBEAAVHbLineEdit@@XZ @ 44 NONAME ; class HbLineEdit & Dialpad::editor(void) const - ??_EDialpad@@UAE@I@Z @ 45 NONAME ; Dialpad::~Dialpad(unsigned int) - ?closeAnimFinished@Dialpad@@IAEXXZ @ 46 NONAME ; void Dialpad::closeAnimFinished(void) - ?metaObject@DialpadKeyHandler@@UBEPBUQMetaObject@@XZ @ 47 NONAME ; struct QMetaObject const * DialpadKeyHandler::metaObject(void) const - ??0DialpadKeyHandler@@QAE@PAVDialpad@@AAVHbMainWindow@@PAVQObject@@@Z @ 48 NONAME ; DialpadKeyHandler::DialpadKeyHandler(class Dialpad *, class HbMainWindow &, class QObject *) - ?isOpen@Dialpad@@QBE_NXZ @ 49 NONAME ; bool Dialpad::isOpen(void) const - ?aboutToOpen@Dialpad@@IAEXXZ @ 50 NONAME ; void Dialpad::aboutToOpen(void) - ??1DialpadVtKeyHandler@@UAE@XZ @ 51 NONAME ; DialpadVtKeyHandler::~DialpadVtKeyHandler(void) - ?metaObject@DialpadVtKeyHandler@@UBEPBUQMetaObject@@XZ @ 52 NONAME ; struct QMetaObject const * DialpadVtKeyHandler::metaObject(void) const - ?tr@DialpadVtKeyHandler@@SA?AVQString@@PBD0H@Z @ 53 NONAME ; class QString DialpadVtKeyHandler::tr(char const *, char const *, int) - ??0DialpadVtKeyHandler@@QAE@PAVDialpad@@AAVHbMainWindow@@PAVQObject@@@Z @ 54 NONAME ; DialpadVtKeyHandler::DialpadVtKeyHandler(class Dialpad *, class HbMainWindow &, class QObject *) - ?trUtf8@DialpadVtKeyHandler@@SA?AVQString@@PBD0H@Z @ 55 NONAME ; class QString DialpadVtKeyHandler::trUtf8(char const *, char const *, int) - ?trUtf8@DialpadVtKeyHandler@@SA?AVQString@@PBD0@Z @ 56 NONAME ; class QString DialpadVtKeyHandler::trUtf8(char const *, char const *) - ?staticMetaObject@DialpadVtKeyHandler@@2UQMetaObject@@B @ 57 NONAME ; struct QMetaObject const DialpadVtKeyHandler::staticMetaObject - ?qt_metacall@DialpadVtKeyHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 58 NONAME ; int DialpadVtKeyHandler::qt_metacall(enum QMetaObject::Call, int, void * *) - ?getStaticMetaObject@DialpadVtKeyHandler@@SAABUQMetaObject@@XZ @ 59 NONAME ; struct QMetaObject const & DialpadVtKeyHandler::getStaticMetaObject(void) - ??_EDialpadVtKeyHandler@@UAE@I@Z @ 60 NONAME ; DialpadVtKeyHandler::~DialpadVtKeyHandler(unsigned int) - ?qt_metacast@DialpadVtKeyHandler@@UAEPAXPBD@Z @ 61 NONAME ; void * DialpadVtKeyHandler::qt_metacast(char const *) - ?tr@DialpadVtKeyHandler@@SA?AVQString@@PBD0@Z @ 62 NONAME ; class QString DialpadVtKeyHandler::tr(char const *, char const *) - ??0DialpadKeyHandler@@QAE@PAVDialpad@@V?$QFlags@W4DialpadKeyEventFilter@DialpadKeyHandler@@@@PAVQObject@@@Z @ 63 NONAME ; DialpadKeyHandler::DialpadKeyHandler(class Dialpad *, class QFlags, class QObject *) + ??1DialpadVtKeyHandler@@UAE@XZ @ 1 NONAME ; DialpadVtKeyHandler::~DialpadVtKeyHandler(void) + ?initialize@Dialpad@@AAEXXZ @ 2 NONAME ; void Dialpad::initialize(void) + ?metaObject@DialpadVtKeyHandler@@UBEPBUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const * DialpadVtKeyHandler::metaObject(void) const + ?closeEvent@Dialpad@@MAEXPAVQCloseEvent@@@Z @ 4 NONAME ; void Dialpad::closeEvent(class QCloseEvent *) + ?trUtf8@DialpadKeyHandler@@SA?AVQString@@PBD0H@Z @ 5 NONAME ; class QString DialpadKeyHandler::trUtf8(char const *, char const *, int) + ?openAnimValueChanged@Dialpad@@IAEXM@Z @ 6 NONAME ; void Dialpad::openAnimValueChanged(float) + ?getStaticMetaObject@DialpadKeyHandler@@SAABUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const & DialpadKeyHandler::getStaticMetaObject(void) + ?showEvent@Dialpad@@MAEXPAVQShowEvent@@@Z @ 8 NONAME ; void Dialpad::showEvent(class QShowEvent *) + ?tr@DialpadVtKeyHandler@@SA?AVQString@@PBD0H@Z @ 9 NONAME ; class QString DialpadVtKeyHandler::tr(char const *, char const *, int) + ?metaObject@Dialpad@@UBEPBUQMetaObject@@XZ @ 10 NONAME ; struct QMetaObject const * Dialpad::metaObject(void) const + ??0DialpadVtKeyHandler@@QAE@PAVDialpad@@AAVHbMainWindow@@PAVQObject@@@Z @ 11 NONAME ; DialpadVtKeyHandler::DialpadVtKeyHandler(class Dialpad *, class HbMainWindow &, class QObject *) + ?trUtf8@DialpadVtKeyHandler@@SA?AVQString@@PBD0H@Z @ 12 NONAME ; class QString DialpadVtKeyHandler::trUtf8(char const *, char const *, int) + ?staticMetaObject@Dialpad@@2UQMetaObject@@B @ 13 NONAME ; struct QMetaObject const Dialpad::staticMetaObject + ?trUtf8@DialpadVtKeyHandler@@SA?AVQString@@PBD0@Z @ 14 NONAME ; class QString DialpadVtKeyHandler::trUtf8(char const *, char const *) + ?staticMetaObject@DialpadVtKeyHandler@@2UQMetaObject@@B @ 15 NONAME ; struct QMetaObject const DialpadVtKeyHandler::staticMetaObject + ??1Dialpad@@UAE@XZ @ 16 NONAME ; Dialpad::~Dialpad(void) + ?setTapOutsideDismiss@Dialpad@@QAEX_N@Z @ 17 NONAME ; void Dialpad::setTapOutsideDismiss(bool) + ?getStaticMetaObject@Dialpad@@SAABUQMetaObject@@XZ @ 18 NONAME ; struct QMetaObject const & Dialpad::getStaticMetaObject(void) + ?trUtf8@DialpadKeyHandler@@SA?AVQString@@PBD0@Z @ 19 NONAME ; class QString DialpadKeyHandler::trUtf8(char const *, char const *) + ?qt_metacall@DialpadVtKeyHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 20 NONAME ; int DialpadVtKeyHandler::qt_metacall(enum QMetaObject::Call, int, void * *) + ?gestureEvent@Dialpad@@MAEXPAVQGestureEvent@@@Z @ 21 NONAME ; void Dialpad::gestureEvent(class QGestureEvent *) + ?paint@Dialpad@@MAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 22 NONAME ; void Dialpad::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) + ?layoutBackgroundItem@Dialpad@@AAEXXZ @ 23 NONAME ; void Dialpad::layoutBackgroundItem(void) + ?updateLayout@Dialpad@@AAEXW4Orientation@Qt@@@Z @ 24 NONAME ; void Dialpad::updateLayout(enum Qt::Orientation) + ?openAnimFinished@Dialpad@@IAEXXZ @ 25 NONAME ; void Dialpad::openAnimFinished(void) + ?getStaticMetaObject@DialpadVtKeyHandler@@SAABUQMetaObject@@XZ @ 26 NONAME ; struct QMetaObject const & DialpadVtKeyHandler::getStaticMetaObject(void) + ?setCallButtonEnabled@Dialpad@@QAEX_N@Z @ 27 NONAME ; void Dialpad::setCallButtonEnabled(bool) + ?startCloseAnimation@Dialpad@@AAEXXZ @ 28 NONAME ; void Dialpad::startCloseAnimation(void) + ?closeDialpad@Dialpad@@QAEXXZ @ 29 NONAME ; void Dialpad::closeDialpad(void) + ?aboutToClose@Dialpad@@IAEXXZ @ 30 NONAME ; void Dialpad::aboutToClose(void) + ?qt_metacast@DialpadKeyHandler@@UAEPAXPBD@Z @ 31 NONAME ; void * DialpadKeyHandler::qt_metacast(char const *) + ??_EDialpadVtKeyHandler@@UAE@I@Z @ 32 NONAME ; DialpadVtKeyHandler::~DialpadVtKeyHandler(unsigned int) + ??0Dialpad@@QAE@ABVHbMainWindow@@@Z @ 33 NONAME ; Dialpad::Dialpad(class HbMainWindow const &) + ?isOpen@Dialpad@@QBE_NXZ @ 34 NONAME ; bool Dialpad::isOpen(void) const + ?trUtf8@Dialpad@@SA?AVQString@@PBD0H@Z @ 35 NONAME ; class QString Dialpad::trUtf8(char const *, char const *, int) + ?closeAnimValueChanged@Dialpad@@IAEXM@Z @ 36 NONAME ; void Dialpad::closeAnimValueChanged(float) + ?qt_metacast@Dialpad@@UAEPAXPBD@Z @ 37 NONAME ; void * Dialpad::qt_metacast(char const *) + ?tr@DialpadKeyHandler@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString DialpadKeyHandler::tr(char const *, char const *) + ??0Dialpad@@QAE@XZ @ 39 NONAME ; Dialpad::Dialpad(void) + ?openDialpad@Dialpad@@QAEXXZ @ 40 NONAME ; void Dialpad::openDialpad(void) + ?staticMetaObject@DialpadKeyHandler@@2UQMetaObject@@B @ 41 NONAME ; struct QMetaObject const DialpadKeyHandler::staticMetaObject + ?aboutToOpen@Dialpad@@IAEXXZ @ 42 NONAME ; void Dialpad::aboutToOpen(void) + ??1DialpadKeyHandler@@UAE@XZ @ 43 NONAME ; DialpadKeyHandler::~DialpadKeyHandler(void) + ?orientationChangeFinished@Dialpad@@IAEXW4Orientation@Qt@@@Z @ 44 NONAME ; void Dialpad::orientationChangeFinished(enum Qt::Orientation) + ?qt_metacall@DialpadKeyHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 45 NONAME ; int DialpadKeyHandler::qt_metacall(enum QMetaObject::Call, int, void * *) + ?hideEvent@Dialpad@@MAEXPAVQHideEvent@@@Z @ 46 NONAME ; void Dialpad::hideEvent(class QHideEvent *) + ?tr@Dialpad@@SA?AVQString@@PBD0@Z @ 47 NONAME ; class QString Dialpad::tr(char const *, char const *) + ?qt_metacast@DialpadVtKeyHandler@@UAEPAXPBD@Z @ 48 NONAME ; void * DialpadVtKeyHandler::qt_metacast(char const *) + ?orientationChangeStarted@Dialpad@@IAEXXZ @ 49 NONAME ; void Dialpad::orientationChangeStarted(void) + ?trUtf8@Dialpad@@SA?AVQString@@PBD0@Z @ 50 NONAME ; class QString Dialpad::trUtf8(char const *, char const *) + ?tr@DialpadKeyHandler@@SA?AVQString@@PBD0H@Z @ 51 NONAME ; class QString DialpadKeyHandler::tr(char const *, char const *, int) + ?qt_metacall@Dialpad@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 52 NONAME ; int Dialpad::qt_metacall(enum QMetaObject::Call, int, void * *) + ?tr@DialpadVtKeyHandler@@SA?AVQString@@PBD0@Z @ 53 NONAME ; class QString DialpadVtKeyHandler::tr(char const *, char const *) + ?tr@Dialpad@@SA?AVQString@@PBD0H@Z @ 54 NONAME ; class QString Dialpad::tr(char const *, char const *, int) + ??_EDialpadKeyHandler@@UAE@I@Z @ 55 NONAME ; DialpadKeyHandler::~DialpadKeyHandler(unsigned int) + ??0DialpadKeyHandler@@QAE@PAVDialpad@@V?$QFlags@W4DialpadKeyEventFilter@DialpadKeyHandler@@@@PAVQObject@@@Z @ 56 NONAME ; DialpadKeyHandler::DialpadKeyHandler(class Dialpad *, class QFlags, class QObject *) + ??_EDialpad@@UAE@I@Z @ 57 NONAME ; Dialpad::~Dialpad(unsigned int) + ?editor@Dialpad@@QBEAAVHbLineEdit@@XZ @ 58 NONAME ; class HbLineEdit & Dialpad::editor(void) const + ?closeAnimFinished@Dialpad@@IAEXXZ @ 59 NONAME ; void Dialpad::closeAnimFinished(void) + ?metaObject@DialpadKeyHandler@@UBEPBUQMetaObject@@XZ @ 60 NONAME ; struct QMetaObject const * DialpadKeyHandler::metaObject(void) const + ??0DialpadKeyHandler@@QAE@PAVDialpad@@AAVHbMainWindow@@PAVQObject@@@Z @ 61 NONAME ; DialpadKeyHandler::DialpadKeyHandler(class Dialpad *, class HbMainWindow &, class QObject *) diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/dialpad.pro --- a/telutils/dialpad/dialpad.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/dialpad.pro Wed Jun 23 18:49:32 2010 +0300 @@ -18,6 +18,7 @@ TEMPLATE = lib TARGET = dialpad CONFIG += hb +HB += hbinput INCLUDEPATH += . inc ../../inc @@ -92,7 +93,8 @@ INCLUDEPATH += ../../phonesrv_plat/dialpad_api/inc \ c:/hb/include/hbcore \ c:/hb/include/hbwidgets \ - c:/hb/include/hbtools + c:/hb/include/hbtools \ + c:/hb/include/hbinput INCLUDEPATH += ../xqtelephonyservice/inc } diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/dialpad.qrc --- a/telutils/dialpad/dialpad.qrc Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/dialpad.qrc Wed Jun 23 18:49:32 2010 +0300 @@ -2,35 +2,8 @@ resources/dialpad.dialpadbutton.widgetml resources/dialpad.css - themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg - themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg - themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg - themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg - themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg - themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg - themes/icons/hbdefault/scalable/qtg_mono_answer_call.svg - themes/icons/hbdefault/scalable/qtg_graf_input_swipe.svg - themes/icons/hbdefault/scalable/qtg_fr_input_bg_b.svg - themes/icons/hbdefault/scalable/qtg_fr_input_bg_c.svg - themes/icons/hbdefault/scalable/qtg_fr_input_bg_t.svg - themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg resources/dialpad_color.css + resources/dialpad_to_prt.fxml + resources/dialpad_to_lsc.fxml diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/eabi/dialpadu.def --- a/telutils/dialpad/eabi/dialpadu.def Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/eabi/dialpadu.def Wed Jun 23 18:49:32 2010 +0300 @@ -3,72 +3,68 @@ _ZN17DialpadKeyHandler11qt_metacastEPKc @ 2 NONAME _ZN17DialpadKeyHandler16staticMetaObjectE @ 3 NONAME DATA 16 _ZN17DialpadKeyHandler19getStaticMetaObjectEv @ 4 NONAME - _ZN17DialpadKeyHandlerC1EP7DialpadR12HbMainWindowP7QObject @ 5 NONAME - _ZN17DialpadKeyHandlerC2EP7DialpadR12HbMainWindowP7QObject @ 6 NONAME - _ZN17DialpadKeyHandlerD0Ev @ 7 NONAME - _ZN17DialpadKeyHandlerD1Ev @ 8 NONAME - _ZN17DialpadKeyHandlerD2Ev @ 9 NONAME - _ZN7Dialpad10closeEventEP11QCloseEvent @ 10 NONAME - _ZN7Dialpad10initializeEv @ 11 NONAME - _ZN7Dialpad10sceneEventEP6QEvent @ 12 NONAME - _ZN7Dialpad11openDialpadEv @ 13 NONAME - _ZN7Dialpad11qt_metacallEN11QMetaObject4CallEiPPv @ 14 NONAME - _ZN7Dialpad11qt_metacastEPKc @ 15 NONAME - _ZN7Dialpad12aboutToCloseEv @ 16 NONAME - _ZN7Dialpad12closeDialpadEv @ 17 NONAME - _ZN7Dialpad12updateLayoutEN2Qt11OrientationE @ 18 NONAME - _ZN7Dialpad16handleSceneEventEP6QEvent @ 19 NONAME - _ZN7Dialpad16openAnimFinishedEv @ 20 NONAME - _ZN7Dialpad16sceneEventFilterEP13QGraphicsItemP6QEvent @ 21 NONAME - _ZN7Dialpad16staticMetaObjectE @ 22 NONAME DATA 16 - _ZN7Dialpad17closeAnimFinishedEv @ 23 NONAME - _ZN7Dialpad19getStaticMetaObjectEv @ 24 NONAME - _ZN7Dialpad19startCloseAnimationEv @ 25 NONAME - _ZN7Dialpad20layoutBackgroundItemEv @ 26 NONAME - _ZN7Dialpad20openAnimValueChangedEf @ 27 NONAME - _ZN7Dialpad20setCallButtonEnabledEb @ 28 NONAME - _ZN7Dialpad20setTapOutsideDismissEb @ 29 NONAME - _ZN7Dialpad21closeAnimValueChangedEf @ 30 NONAME - _ZN7Dialpad24orientationChangeStartedEv @ 31 NONAME - _ZN7Dialpad25orientationChangeFinishedEN2Qt11OrientationE @ 32 NONAME - _ZN7Dialpad5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 33 NONAME - _ZN7Dialpad9hideEventEP10QHideEvent @ 34 NONAME - _ZN7Dialpad9showEventEP10QShowEvent @ 35 NONAME - _ZN7DialpadC1ERK12HbMainWindow @ 36 NONAME - _ZN7DialpadC1Ev @ 37 NONAME - _ZN7DialpadC2ERK12HbMainWindow @ 38 NONAME - _ZN7DialpadC2Ev @ 39 NONAME - _ZN7DialpadD0Ev @ 40 NONAME - _ZN7DialpadD1Ev @ 41 NONAME - _ZN7DialpadD2Ev @ 42 NONAME - _ZNK17DialpadKeyHandler10metaObjectEv @ 43 NONAME - _ZNK7Dialpad10metaObjectEv @ 44 NONAME - _ZNK7Dialpad6editorEv @ 45 NONAME - _ZNK7Dialpad6isOpenEv @ 46 NONAME - _ZTI17DialpadKeyHandler @ 47 NONAME - _ZTI7Dialpad @ 48 NONAME - _ZTV17DialpadKeyHandler @ 49 NONAME - _ZTV7Dialpad @ 50 NONAME - _ZThn16_N7DialpadD0Ev @ 51 NONAME - _ZThn16_N7DialpadD1Ev @ 52 NONAME - _ZThn8_N7Dialpad10sceneEventEP6QEvent @ 53 NONAME - _ZThn8_N7Dialpad16sceneEventFilterEP13QGraphicsItemP6QEvent @ 54 NONAME - _ZThn8_N7Dialpad5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 55 NONAME - _ZThn8_N7DialpadD0Ev @ 56 NONAME - _ZThn8_N7DialpadD1Ev @ 57 NONAME - _ZN7Dialpad11aboutToOpenEv @ 58 NONAME - _ZN19DialpadVtKeyHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 59 NONAME - _ZN19DialpadVtKeyHandler11qt_metacastEPKc @ 60 NONAME - _ZN19DialpadVtKeyHandler16staticMetaObjectE @ 61 NONAME DATA 16 - _ZN19DialpadVtKeyHandler19getStaticMetaObjectEv @ 62 NONAME - _ZN19DialpadVtKeyHandlerC1EP7DialpadR12HbMainWindowP7QObject @ 63 NONAME - _ZN19DialpadVtKeyHandlerC2EP7DialpadR12HbMainWindowP7QObject @ 64 NONAME - _ZN19DialpadVtKeyHandlerD0Ev @ 65 NONAME - _ZN19DialpadVtKeyHandlerD1Ev @ 66 NONAME - _ZN19DialpadVtKeyHandlerD2Ev @ 67 NONAME - _ZNK19DialpadVtKeyHandler10metaObjectEv @ 68 NONAME - _ZTI19DialpadVtKeyHandler @ 69 NONAME - _ZTV19DialpadVtKeyHandler @ 70 NONAME - _ZN17DialpadKeyHandlerC1EP7Dialpad6QFlagsINS_21DialpadKeyEventFilterEEP7QObject @ 71 NONAME - _ZN17DialpadKeyHandlerC2EP7Dialpad6QFlagsINS_21DialpadKeyEventFilterEEP7QObject @ 72 NONAME + _ZN17DialpadKeyHandlerC1EP7Dialpad6QFlagsINS_21DialpadKeyEventFilterEEP7QObject @ 5 NONAME + _ZN17DialpadKeyHandlerC1EP7DialpadR12HbMainWindowP7QObject @ 6 NONAME + _ZN17DialpadKeyHandlerC2EP7Dialpad6QFlagsINS_21DialpadKeyEventFilterEEP7QObject @ 7 NONAME + _ZN17DialpadKeyHandlerC2EP7DialpadR12HbMainWindowP7QObject @ 8 NONAME + _ZN17DialpadKeyHandlerD0Ev @ 9 NONAME + _ZN17DialpadKeyHandlerD1Ev @ 10 NONAME + _ZN17DialpadKeyHandlerD2Ev @ 11 NONAME + _ZN19DialpadVtKeyHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 12 NONAME + _ZN19DialpadVtKeyHandler11qt_metacastEPKc @ 13 NONAME + _ZN19DialpadVtKeyHandler16staticMetaObjectE @ 14 NONAME DATA 16 + _ZN19DialpadVtKeyHandler19getStaticMetaObjectEv @ 15 NONAME + _ZN19DialpadVtKeyHandlerC1EP7DialpadR12HbMainWindowP7QObject @ 16 NONAME + _ZN19DialpadVtKeyHandlerC2EP7DialpadR12HbMainWindowP7QObject @ 17 NONAME + _ZN19DialpadVtKeyHandlerD0Ev @ 18 NONAME + _ZN19DialpadVtKeyHandlerD1Ev @ 19 NONAME + _ZN19DialpadVtKeyHandlerD2Ev @ 20 NONAME + _ZN7Dialpad10closeEventEP11QCloseEvent @ 21 NONAME + _ZN7Dialpad10initializeEv @ 22 NONAME + _ZN7Dialpad11aboutToOpenEv @ 23 NONAME + _ZN7Dialpad11openDialpadEv @ 24 NONAME + _ZN7Dialpad11qt_metacallEN11QMetaObject4CallEiPPv @ 25 NONAME + _ZN7Dialpad11qt_metacastEPKc @ 26 NONAME + _ZN7Dialpad12aboutToCloseEv @ 27 NONAME + _ZN7Dialpad12closeDialpadEv @ 28 NONAME + _ZN7Dialpad12gestureEventEP13QGestureEvent @ 29 NONAME + _ZN7Dialpad12updateLayoutEN2Qt11OrientationE @ 30 NONAME + _ZN7Dialpad16openAnimFinishedEv @ 31 NONAME + _ZN7Dialpad16staticMetaObjectE @ 32 NONAME DATA 16 + _ZN7Dialpad17closeAnimFinishedEv @ 33 NONAME + _ZN7Dialpad19getStaticMetaObjectEv @ 34 NONAME + _ZN7Dialpad19startCloseAnimationEv @ 35 NONAME + _ZN7Dialpad20layoutBackgroundItemEv @ 36 NONAME + _ZN7Dialpad20openAnimValueChangedEf @ 37 NONAME + _ZN7Dialpad20setCallButtonEnabledEb @ 38 NONAME + _ZN7Dialpad20setTapOutsideDismissEb @ 39 NONAME + _ZN7Dialpad21closeAnimValueChangedEf @ 40 NONAME + _ZN7Dialpad24orientationChangeStartedEv @ 41 NONAME + _ZN7Dialpad25orientationChangeFinishedEN2Qt11OrientationE @ 42 NONAME + _ZN7Dialpad5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 43 NONAME + _ZN7Dialpad9hideEventEP10QHideEvent @ 44 NONAME + _ZN7Dialpad9showEventEP10QShowEvent @ 45 NONAME + _ZN7DialpadC1ERK12HbMainWindow @ 46 NONAME + _ZN7DialpadC1Ev @ 47 NONAME + _ZN7DialpadC2ERK12HbMainWindow @ 48 NONAME + _ZN7DialpadC2Ev @ 49 NONAME + _ZN7DialpadD0Ev @ 50 NONAME + _ZN7DialpadD1Ev @ 51 NONAME + _ZN7DialpadD2Ev @ 52 NONAME + _ZNK17DialpadKeyHandler10metaObjectEv @ 53 NONAME + _ZNK19DialpadVtKeyHandler10metaObjectEv @ 54 NONAME + _ZNK7Dialpad10metaObjectEv @ 55 NONAME + _ZNK7Dialpad6editorEv @ 56 NONAME + _ZNK7Dialpad6isOpenEv @ 57 NONAME + _ZTI17DialpadKeyHandler @ 58 NONAME + _ZTI19DialpadVtKeyHandler @ 59 NONAME + _ZTI7Dialpad @ 60 NONAME + _ZTV17DialpadKeyHandler @ 61 NONAME + _ZTV19DialpadVtKeyHandler @ 62 NONAME + _ZTV7Dialpad @ 63 NONAME + _ZThn16_N7DialpadD0Ev @ 64 NONAME + _ZThn16_N7DialpadD1Ev @ 65 NONAME + _ZThn8_N7Dialpad5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 66 NONAME + _ZThn8_N7DialpadD0Ev @ 67 NONAME + _ZThn8_N7DialpadD1Ev @ 68 NONAME diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/inc/dialpadkeypad.h --- a/telutils/dialpad/inc/dialpadkeypad.h Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/inc/dialpadkeypad.h Wed Jun 23 18:49:32 2010 +0300 @@ -18,17 +18,14 @@ #ifndef DIALPADKEYPAD_H #define DIALPADKEYPAD_H -#include +#include -class DialpadButton; class DialpadInputField; class DialpadButton; class QSignalMapper; class QGraphicsGridLayout; -const int DialpadButtonCount = 13; - -class DialpadKeypad : public HbWidget +class DialpadKeypad : public HbInputButtonGroup { Q_OBJECT @@ -41,41 +38,33 @@ ~DialpadKeypad(); public: - void setLongPressDuration(int duration); - void setCallButtonEnabled(bool enabled); - void createButtonGrid(); - void resetButtons(); + DialpadButton& callButton() const; + protected slots: void setButtonTexts(); - void handleKeyPressed(int key); + void handleKeyClicked(int key); - void handleKeyReleased(int key); - void handleLongPress(); - -protected: - void showEvent(QShowEvent *event); + void sendKeyPressEvent(const QKeyEvent& event); + void sendKeyReleaseEvent(const QKeyEvent& event); + void sendLongPressEvent(const QKeyEvent& event); + void handleKeyChangeEvent(const QKeyEvent& releaseEvent, + const QKeyEvent& pressEvent); private: void postKeyEvent(QEvent::Type type, int key); void sendKeyEventToEditor(QEvent::Type type, int key); - inline bool isNumericKey(int key); private: const HbMainWindow& mMainWindow; DialpadInputField& mInputField; - QGraphicsGridLayout* mGridLayout; - DialpadButton* mButtons[DialpadButtonCount]; - QSignalMapper* mKeyPressedSignalMapper; - QSignalMapper* mKeyReleasedSignalMapper; QSignalMapper* mKeyClickedSignalMapper; QMap mGeneratedChar; int mPressedNumericKey; - QTimer* mLongPressTimer; - int mLongPressDuration; + DialpadButton* mCallButton; }; #endif // DIALPADKEYPAD_H diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/inc/dialpadkeysequenceeventfilter.h --- a/telutils/dialpad/inc/dialpadkeysequenceeventfilter.h Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/inc/dialpadkeysequenceeventfilter.h Wed Jun 23 18:49:32 2010 +0300 @@ -18,7 +18,9 @@ #ifndef DIALPADKEYSEQUENCEEVENTFILTER_H #define DIALPADKEYSEQUENCEEVENTFILTER_H -#include +#include +#include +#include class Dialpad; @@ -40,19 +42,19 @@ bool eventFilter(QObject *watched, QEvent *event); private: - /*! - \fn bool preValidateKeySequence() - - Checks if the given sequence conforms key sequence command syntax. - - \return true if sequence conforms key sequence command syntax, - false otherwise. - */ - bool preValidateKeySequence(const QString &sequence); + void constructKeySequenceToHandlerMappings(); + XQAiwInterfaceDescriptor findKeySequenceHandler( + const QString &keySequenceCandidate); private: /*! Dialpad. Not own. */ Dialpad* mDialpad; + + /*! Application manager. */ + XQApplicationManager mAiwMgr; + + /*! Key sequence validators and associated sequence handlers. */ + QMap mValidators; }; #endif // DIALPADKEYSEQUENCEEVENTFILTER_H diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/resources/dialpad_to_lsc.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/resources/dialpad_to_lsc.fxml Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,28 @@ + + + + + 1.0 + + 0 + 0 + 1 + + + + 0.5 + + -90 + 0 + + + 0.5 + 0.5 + + 0 + 0 + 1 + + + + diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/resources/dialpad_to_prt.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/resources/dialpad_to_prt.fxml Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,28 @@ + + + + + 1.0 + + 0 + 0 + 1 + + + + 0.5 + + 90 + 0 + + + 0.5 + 0.5 + + 0 + 0 + 1 + + + + diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/src/dialpad.cpp --- a/telutils/dialpad/src/dialpad.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/src/dialpad.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include #include #include @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include "dialpad.h" #include "dialpadinputfield.h" @@ -32,24 +34,31 @@ #include "dialpadbutton.h" #include "dialpadmultitaphandler.h" #include "dialpadbackground.h" +#include "dialpadbutton.h" static const QString backgroundGraphics("qtg_fr_input_v_bg"); static const QString backgroundGraphicsH("qtg_fr_input_h_bg"); static const QString minimizeIcon("qtg_graf_input_v_swipe"); static const QString minimizeIconH("qtg_graf_input_h_swipe"); -static const qreal DialpadCloseSwipeDistanceV = 0.25; //compared to total height -static const qreal DialpadCloseSwipeDistanceH = 0.33; // > button width -static const int DialpadMaxSwipeTime = 300; // ms static const int DialpadCloseAnimDuration = 200; // ms static const int DialpadOpenAnimDuration = 200; // ms static const qreal DialpadComponentMargin = 0.75; // units static const qreal DialpadCloseHandleHeight = 2.23; // units static const qreal DialpadCloseHandleWidth = 18.8; // units +static const qreal DialpadCallButtonHeight = 8.0; // units +static const qreal DialpadCallButtonHeightH = 6.0; // units + +static const QString handsetIcon("qtg_mono_call"); +static const QString vmbxIcon("qtg_mono_voice_mailbox"); + +const char *DIALPAD_TO_PRT_FXML = ":/dialpad_to_prt.fxml"; +const char *DIALPAD_TO_LSC_FXML = ":/dialpad_to_lsc.fxml"; +const char *DIALPAD_TO_PRT_EVENT = "prt_activated"; +const char *DIALPAD_TO_LSC_EVENT = "lsc_activated"; Dialpad::Dialpad() : mMainWindow(*hbInstance->allMainWindows().at(0)), mBackgroundItem(0), - mMouseButtonPressedDown(false), mOpenTimeLine(DialpadOpenAnimDuration), mCloseTimeLine(DialpadCloseAnimDuration), mAnimationOngoing(false), @@ -63,7 +72,6 @@ Dialpad::Dialpad(const HbMainWindow& mainWindow) : mMainWindow(mainWindow), mBackgroundItem(0), - mMouseButtonPressedDown(false), mOpenTimeLine(DialpadOpenAnimDuration), mCloseTimeLine(DialpadCloseAnimDuration), mAnimationOngoing(false), @@ -83,7 +91,6 @@ // create keypad mKeypad = new DialpadKeypad(mMainWindow,*mInputField,this); - mKeypad->setLongPressDuration(DialpadMaxSwipeTime); // layouting params qreal unit = HbDeviceProfile::current().unitValue(); @@ -91,6 +98,9 @@ mCloseHandleHeight = DialpadCloseHandleHeight * unit; mCloseHandleWidth = DialpadCloseHandleWidth * unit; + mKeypad->callButton().setPreferredHeight(DialpadCallButtonHeight*unit); + mKeypad->callButton().setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + // create popup background mBackgroundDrawer = new HbFrameDrawer(); mIconDrawer = new HbFrameDrawer(); @@ -100,6 +110,7 @@ new QGraphicsLinearLayout(Qt::Vertical); popupLayout->addItem(mInputField); popupLayout->addItem(mKeypad); + popupLayout->addItem(&mKeypad->callButton()); popupLayout->setContentsMargins(margin, mCloseHandleHeight, margin, margin); popupLayout->setSpacing(margin); setLayout(popupLayout); @@ -109,6 +120,7 @@ mInputField->editor().installEventFilter(mMultitap); // close animation + mCloseTimeLine.setUpdateInterval(16); mCloseTimeLine.setEasingCurve(QEasingCurve::InQuad); connect(&mCloseTimeLine, SIGNAL(finished()), SLOT(closeAnimFinished())); @@ -116,6 +128,7 @@ SLOT(closeAnimValueChanged(qreal))); // open animation + mOpenTimeLine.setUpdateInterval(16); mOpenTimeLine.setEasingCurve(QEasingCurve::OutQuad); connect(&mOpenTimeLine, SIGNAL(finished()), SLOT(openAnimFinished())); @@ -140,6 +153,10 @@ grabGesture(Qt::PanGesture); grabGesture(Qt::SwipeGesture); grabGesture(Qt::PinchGesture); + + // effects + HbEffect::add(this, DIALPAD_TO_PRT_FXML, DIALPAD_TO_PRT_EVENT); + HbEffect::add(this, DIALPAD_TO_LSC_FXML, DIALPAD_TO_LSC_EVENT); } Dialpad::~Dialpad() @@ -233,7 +250,6 @@ } if (mOrientation!=previousOrientation) { - mKeypad->createButtonGrid(); updateLayout((Qt::Orientation)mOrientation); } @@ -295,58 +311,6 @@ } } -bool Dialpad::sceneEvent(QEvent *event) -{ - return handleSceneEvent(event); -} - -bool Dialpad::sceneEventFilter(QGraphicsItem *watched, QEvent *event) -{ - Q_UNUSED(watched); - - return handleSceneEvent(event); -} - -bool Dialpad::handleSceneEvent(QEvent *event) -{ - // handle close swipe gesture - if (event->type() == QEvent::GraphicsSceneMousePress) { - mMouseButtonPressedDown = true; - mSwipeTimer.start(); - } else if (event->type() == QEvent::GraphicsSceneMouseRelease && - mMouseButtonPressedDown) { - mMouseButtonPressedDown = false; - QGraphicsSceneMouseEvent *mouseEvent = - static_cast (event); - - // check if mouse has moved DialpadCloseSwipeDistance vertically - QPointF delta = mouseEvent->scenePos() - - mouseEvent->buttonDownScenePos(Qt::LeftButton); - - if (mOrientation==Qt::Vertical) { - qreal height = geometry().height() * DialpadCloseSwipeDistanceV; - - if ( (delta.y() >= height) && - (mSwipeTimer.elapsed() <= DialpadMaxSwipeTime)) { - startCloseAnimation(); - } - } else { - qreal width = geometry().width() * DialpadCloseSwipeDistanceH; - bool swipe = (layoutDirection()==Qt::LeftToRight && - delta.x() >= width) || - (layoutDirection()==Qt::RightToLeft && - -delta.x() >= width); - - if ( swipe && - (mSwipeTimer.elapsed() <= DialpadMaxSwipeTime)) { - startCloseAnimation(); - } - } - } - - return false; -} - void Dialpad::startCloseAnimation() { if (!mAnimationOngoing) { @@ -359,10 +323,6 @@ { HbWidget::showEvent(event); - // for closing swipe gesture - installSceneEventFilter(this); - setFiltersChildEvents(true); - if (mBackgroundItem) { layoutBackgroundItem(); mBackgroundItem->show(); @@ -372,8 +332,6 @@ void Dialpad::hideEvent(QHideEvent *event) { HbWidget::hideEvent(event); - setFiltersChildEvents(false); - removeSceneEventFilter(this); } void Dialpad::closeEvent(QCloseEvent * event) @@ -450,9 +408,6 @@ void Dialpad::orientationChangeStarted() { hide(); - // needs to re-create grid layout to get - // scale with uniform item sizes - mKeypad->createButtonGrid(); } void Dialpad::orientationChangeFinished(Qt::Orientation current) @@ -461,6 +416,13 @@ show(); + // run orientation change effect + if (current==Qt::Horizontal) { + HbEffect::start(this, DIALPAD_TO_LSC_EVENT); + } else { + HbEffect::start(this, DIALPAD_TO_PRT_EVENT); + } + mOrientation = current; mPosition = pos(); @@ -494,10 +456,40 @@ mCloseHandleHeight, margin, margin); + mKeypad->callButton().setPreferredHeight(DialpadCallButtonHeight*unit); } else { mainLayout->setContentsMargins(mCloseHandleHeight, margin, margin, margin); + mKeypad->callButton().setPreferredHeight(DialpadCallButtonHeightH*unit); } } + +void Dialpad::gestureEvent(QGestureEvent *event) +{ + bool closeGesture(false); + + if(HbSwipeGesture *gesture = qobject_cast( + event->gesture(Qt::SwipeGesture))) { + if (gesture->state() == Qt::GestureFinished) { + if ( mOrientation==Qt::Vertical && + gesture->sceneVerticalDirection() == QSwipeGesture::Down ) { + closeGesture = true; + } else if (layoutDirection()==Qt::LeftToRight && + gesture->sceneHorizontalDirection() == QSwipeGesture::Right) { + closeGesture = true; + } else if (layoutDirection()==Qt::RightToLeft && + gesture->sceneHorizontalDirection() == QSwipeGesture::Left) { + closeGesture = true; + } + } + } + + if (closeGesture) { + startCloseAnimation(); + event->accept(); + } else { + event->ignore(); + } +} diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/src/dialpadbackground.cpp --- a/telutils/dialpad/src/dialpadbackground.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/src/dialpadbackground.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include #include "dialpadbackground.h" #include "dialpad.h" diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/src/dialpadinputfield.cpp --- a/telutils/dialpad/src/dialpadinputfield.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/src/dialpadinputfield.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include #include #include diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/src/dialpadkeypad.cpp --- a/telutils/dialpad/src/dialpadkeypad.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/src/dialpadkeypad.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -15,7 +15,9 @@ * */ -#include +#include +#include + #include #include #include @@ -24,139 +26,107 @@ #include #include #include +#include #include "dialpadkeypad.h" #include "dialpadbutton.h" #include "dialpadinputfield.h" -static const int DialpadRowCount = 5; +static const int DialpadRowCount = 4; static const int DialpadColumnCount = 3; static const QString handsetIcon("qtg_mono_call"); static const QString vmbxIcon("qtg_mono_voice_mailbox"); +static const qreal DialpadKeypadBorderWidth = 0.25; -static const int DialpadButtonToKeyCodeTable[DialpadButtonCount] = +static const int DialpadKeyCodeTable[DialpadRowCount*DialpadColumnCount] = { Qt::Key_1, Qt::Key_2, Qt::Key_3, Qt::Key_4, Qt::Key_5, Qt::Key_6, Qt::Key_7, Qt::Key_8, Qt::Key_9, - Qt::Key_Asterisk, Qt::Key_0, Qt::Key_NumberSign, - Qt::Key_Yes - // Qt::Key_BackSpace is in input field + Qt::Key_Asterisk, Qt::Key_0, Qt::Key_NumberSign + // Qt::Key_Yes and Qt::Key_BackSpace are handled separately }; DialpadKeypad::DialpadKeypad( const HbMainWindow& mainWindow, DialpadInputField& inputField, QGraphicsItem* parent) : - HbWidget(parent), + HbInputButtonGroup(parent), mMainWindow(mainWindow), - mInputField(inputField), - mLongPressDuration(0) + mInputField(inputField) { - // create signal mappers - mKeyPressedSignalMapper = new QSignalMapper(this); - connect(mKeyPressedSignalMapper,SIGNAL(mapped(int)), - SLOT(handleKeyPressed(int))); + setObjectName("keypad"); + + // create clicked signal mapper mKeyClickedSignalMapper = new QSignalMapper(this); connect(mKeyClickedSignalMapper,SIGNAL(mapped(int)), SLOT(handleKeyClicked(int))); - mKeyReleasedSignalMapper = new QSignalMapper(this); - connect(mKeyReleasedSignalMapper,SIGNAL(mapped(int)), - SLOT(handleKeyReleased(int))); + // connect backspace signals connect(&mInputField.backspaceButton(),SIGNAL(clicked()), mKeyClickedSignalMapper,SLOT(map())); mKeyClickedSignalMapper->setMapping(&mInputField.backspaceButton(), Qt::Key_Backspace); // create keypad - for (int i = 0; i < DialpadButtonCount; i++) { - int keyCode = DialpadButtonToKeyCodeTable[i]; + setGridSize(QSize(DialpadColumnCount, DialpadRowCount)); + setButtonBorderSize(DialpadKeypadBorderWidth); - DialpadButton* button = new DialpadButton(this); - mButtons[i] = button; - - button->setStretched(true); - button->setFocusPolicy(Qt::NoFocus); - button->setFlag(QGraphicsItem::ItemIsFocusable,false); + QList buttons; - QString buttonName; - buttonName.setNum(keyCode); - button->setObjectName(buttonName); + for (int i = 0; i < DialpadRowCount * DialpadColumnCount; ++i) { + HbInputButton *item = new HbInputButton( + DialpadKeyCodeTable[i], + QPoint(i % DialpadColumnCount, i / DialpadColumnCount)); + buttons.append(item); - if (keyCode==Qt::Key_Yes) { - HbIcon callIcon(handsetIcon); // todo correct icon - button->setIcon(callIcon); - button->setButtonType(DialpadButton::CallButton); // for css - } else { - button->setButtonType(DialpadButton::NumericButton); // for css - } + item->setType(HbInputButton::ButtonTypeNormal); + } + + setButtons(buttons); - if (keyCode==Qt::Key_1) { - HbIcon mboxIcon(vmbxIcon); - button->setIcon(mboxIcon); - } - - if (keyCode!=Qt::Key_Yes) { - connect(button,SIGNAL(pressed()), - mKeyPressedSignalMapper,SLOT(map())); - mKeyPressedSignalMapper->setMapping(button,keyCode); + // connect keypad signals + QObject::connect(this, SIGNAL(buttonPressed(const QKeyEvent&)), + this, SLOT(sendKeyPressEvent(const QKeyEvent&))); + QObject::connect(this, SIGNAL(buttonReleased(const QKeyEvent&)), + this, SLOT(sendKeyReleaseEvent(const QKeyEvent&))); + QObject::connect(this, SIGNAL(buttonLongPressed(const QKeyEvent&)), + this, SLOT(sendLongPressEvent(const QKeyEvent&))); + QObject::connect(this, SIGNAL(pressedButtonChanged(const QKeyEvent&, + const QKeyEvent&)), + this, SLOT(handleKeyChangeEvent(const QKeyEvent&, + const QKeyEvent&))); - connect(button,SIGNAL(released()), - mKeyReleasedSignalMapper,SLOT(map())); - mKeyReleasedSignalMapper->setMapping(button,keyCode); - } else { - // for Yes-key longPress() functionality is same as clicked() - connect(button,SIGNAL(longPress(QPointF)), - mKeyClickedSignalMapper,SLOT(map())); - mKeyClickedSignalMapper->setMapping(button,keyCode); - } - - connect(button,SIGNAL(clicked()),mKeyClickedSignalMapper,SLOT(map())); - mKeyClickedSignalMapper->setMapping(button,keyCode); - } + // create call button (parent layouts this) + mCallButton = new DialpadButton(parent); + mCallButton->setButtonType(DialpadButton::CallButton); + mCallButton->setIcon(HbIcon(handsetIcon)); + QString buttonName; + buttonName.setNum(Qt::Key_Yes); + mCallButton->setObjectName(buttonName); + connect(mCallButton,SIGNAL(clicked()), + mKeyClickedSignalMapper,SLOT(map())); + connect(mCallButton,SIGNAL(longPress(QPointF)), + mKeyClickedSignalMapper,SLOT(map())); + mKeyClickedSignalMapper->setMapping(mCallButton, + Qt::Key_Yes); // set button texts setButtonTexts(); + // set button icons + button(0)->setIcon(HbIcon(vmbxIcon), + HbInputButton::ButtonIconIndexSecondaryFirstRow); + // update button texts when input language is changed connect(HbInputSettingProxy::instance(), SIGNAL(globalInputLanguageChanged(HbInputLanguage)), this,SLOT(setButtonTexts())); - - createButtonGrid(); - - // timer to handle long press - mLongPressTimer = new QTimer(this); - mLongPressTimer->setSingleShot(true); - connect(mLongPressTimer,SIGNAL(timeout()),SLOT(handleLongPress())); } DialpadKeypad::~DialpadKeypad() { } -void DialpadKeypad::createButtonGrid() -{ - // button grid - mGridLayout = new QGraphicsGridLayout; - - // 12 numeric buttons - int i=0; - for (int row = 0; row < DialpadRowCount-1; row++) { - for (int col = 0; col < DialpadColumnCount; col++) { - mGridLayout->addItem(mButtons[i],row,col); - i++; - } - } - - // call button take the last row - mGridLayout->addItem(mButtons[12],4,0,1,3); - mGridLayout->setSpacing(0); - mGridLayout->setContentsMargins(0,0,0,0); - - setLayout(mGridLayout); -} - void DialpadKeypad::setButtonTexts() { HbInputLanguage inputLanguage = @@ -167,14 +137,17 @@ mGeneratedChar.clear(); if (keymap) { - for (int i = 0; i < DialpadButtonCount-1; i++) { - int keyCode = DialpadButtonToKeyCodeTable[i]; + int buttonCount = (DialpadRowCount*DialpadColumnCount); + for (int i = 0; i < buttonCount; i++) { + int keyCode = DialpadKeyCodeTable[i]; if (keyCode == Qt::Key_Asterisk) { // asterisk is not localized QChar asterisk('*'); - mButtons[i]->setText(asterisk); - mButtons[i]->setAdditionalText("+"); + button(i)->setText(asterisk, + HbInputButton::ButtonTextIndexPrimary); + button(i)->setText("+", + HbInputButton::ButtonTextIndexSecondaryFirstRow); mGeneratedChar.insert(Qt::Key_Asterisk, asterisk); continue; } @@ -182,8 +155,10 @@ if (keyCode == Qt::Key_NumberSign) { // number sign is not localized QChar numberSign('#'); - mButtons[i]->setText(numberSign); - mButtons[i]->setAdditionalText(" "); + button(i)->setText(numberSign, + HbInputButton::ButtonTextIndexPrimary); + button(i)->setText(" ", + HbInputButton::ButtonTextIndexSecondaryFirstRow); mGeneratedChar.insert(Qt::Key_NumberSign, numberSign); continue; } @@ -203,7 +178,8 @@ inputLanguage.language()); // button text - mButtons[i]->setText(numberChar); + button(i)->setText(numberChar, + HbInputButton::ButtonTextIndexPrimary); mGeneratedChar.insert(keyCode,numberChar); // additional text (letters) @@ -219,108 +195,82 @@ QString characters = key->characters(HbModifierNone); if (numberOfCharacters==0 && keyCode!=Qt::Key_1) { - mButtons[i]->setAdditionalText(" "); + button(i)->setText(" ", + HbInputButton::ButtonTextIndexSecondaryFirstRow); } else { - mButtons[i]->setAdditionalText( - characters.left(numberOfCharacters)); + button(i)->setText(characters.left(numberOfCharacters), + HbInputButton::ButtonTextIndexSecondaryFirstRow); } } } } } -void DialpadKeypad::handleKeyPressed(int key) -{ - // Editor is updated on key release (clicked()) or on long press, - // to prevent editor being updated during swipe. - mPressedNumericKey = key; - mLongPressTimer->start(mLongPressDuration); - - postKeyEvent(QEvent::KeyPress, key); -} - void DialpadKeypad::handleKeyClicked(int key) { - if (!isNumericKey(key)) { - postKeyEvent(QEvent::KeyPress, key); - postKeyEvent(QEvent::KeyRelease, key); - } else if (mPressedNumericKey) { - // update editor: generate key press event. - sendKeyEventToEditor(QEvent::KeyPress, key); - } -} - -void DialpadKeypad::handleKeyReleased(int key) -{ - mLongPressTimer->stop(); - + // concerns only yes and backspace keys + postKeyEvent(QEvent::KeyPress, key); postKeyEvent(QEvent::KeyRelease, key); } void DialpadKeypad::postKeyEvent(QEvent::Type type, int key) { + // send simulated key to application QKeyEvent *keyEvent = new QKeyEvent(type, key, Qt::NoModifier); HbApplication::postEvent(const_cast(&mMainWindow),keyEvent); } void DialpadKeypad::sendKeyEventToEditor(QEvent::Type type, int key) { + // send key event to editor QKeyEvent keyEvent(type, key, Qt::NoModifier, mGeneratedChar.value(key)); HbApplication::sendEvent(&mInputField.editor(), &keyEvent); } -void DialpadKeypad::handleLongPress() +void DialpadKeypad::sendKeyPressEvent(const QKeyEvent& event) +{ + mPressedNumericKey = event.key(); + postKeyEvent(QEvent::KeyPress, event.key()); +} + +void DialpadKeypad::sendKeyReleaseEvent(const QKeyEvent& event) { - // key press - sendKeyEventToEditor(QEvent::KeyPress, mPressedNumericKey); + if (mPressedNumericKey) { + // short press, update editor here + sendKeyEventToEditor(QEvent::KeyPress, event.key()); + } + + postKeyEvent(QEvent::KeyRelease, event.key()); +} + +void DialpadKeypad::sendLongPressEvent(const QKeyEvent& event) +{ + sendKeyEventToEditor(QEvent::KeyPress, event.key()); mPressedNumericKey = 0; } -bool DialpadKeypad::isNumericKey(int key) +void DialpadKeypad::handleKeyChangeEvent( + const QKeyEvent& releaseEvent, + const QKeyEvent& pressEvent) { - if (key==Qt::Key_Yes || key==Qt::Key_Backspace) { - return false; - } else { - return true; - } -} + Q_UNUSED(pressEvent) -void DialpadKeypad::setLongPressDuration(int duration) -{ - mLongPressDuration = duration; + postKeyEvent(QEvent::KeyRelease, releaseEvent.key()); + cancelButtonPress(); } void DialpadKeypad::setCallButtonEnabled(bool enabled) { - mButtons[DialpadButtonCount-1]->setEnabled(enabled); -} - -void DialpadKeypad::showEvent(QShowEvent *event) -{ - HbWidget::showEvent(event); - - if (parentWidget()->isVisible()) { - // first show event comes before dialpad is open - // set fixed row and column dimensions - QSizeF effectiveSize(rect().width(), - rect().height()); - - qreal width = effectiveSize.width() / DialpadColumnCount; - qreal height = effectiveSize.height() / DialpadRowCount; - - for (int i=0; i < DialpadColumnCount ;i++) { - mGridLayout->setColumnFixedWidth(i, width); - } - - for (int i=0; i < DialpadRowCount ;i++) { - mGridLayout->setRowFixedHeight(i, height); - } - } + mCallButton->setEnabled(enabled); } void DialpadKeypad::resetButtons() { - for(int i = 0; i < DialpadButtonCount; i++) { - mButtons[i]->setDown(false); - } + cancelButtonPress(); + mCallButton->setDown(false); } + +DialpadButton& DialpadKeypad::callButton() const +{ + return *mCallButton; +} diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/src/dialpadkeysequenceeventfilter.cpp --- a/telutils/dialpad/src/dialpadkeysequenceeventfilter.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/src/dialpadkeysequenceeventfilter.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -14,8 +14,8 @@ * Description: Implements key sequence recognition filter for Dialpad. * */ -#include -#include +#include +#include #include #include #ifdef Q_OS_SYMBIAN @@ -35,6 +35,8 @@ QObject(parent), mDialpad(dialpad) { PHONE_TRACE; + + constructKeySequenceToHandlerMappings(); } @@ -52,7 +54,6 @@ */ bool DialpadKeySequenceEventFilter::eventFilter(QObject *watched, QEvent *event) { - PHONE_TRACE; Q_UNUSED(watched) const bool eventFiltered = false; @@ -65,24 +66,25 @@ // specification. QString keySequenceCandidate = HbStringUtil::convertDigitsTo( mDialpad->editor().text(), WesternDigit); - if (QEvent::KeyRelease == eventType && - Qt::Key_NumberSign == keyCode && - preValidateKeySequence(keySequenceCandidate)) { - XQServiceRequest request( - "com.nokia.symbian.IDtmfPlay", - "executeKeySequence(QString)", - true); - - // Workaround for getting focus back to dialer after service request. - XQRequestInfo requestInfo; - requestInfo.setBackground(true); - request.setInfo(requestInfo); - - QVariant keySequenceProcessed; - request << keySequenceCandidate; - bool requestOk = request.send(keySequenceProcessed); - if (requestOk && keySequenceProcessed.toBool()) { - mDialpad->editor().setText(QString("")); + if (QEvent::KeyRelease == eventType && Qt::Key_NumberSign == keyCode) { + XQAiwInterfaceDescriptor keySequenceHandler = + findKeySequenceHandler(keySequenceCandidate); + if (keySequenceHandler.isValid()) { + QScopedPointer request(mAiwMgr.create( + keySequenceHandler, + "executeKeySequence(QString)", + false)); + request->setSynchronous(true); + request->setBackground(true); + QList arguments; + arguments << keySequenceCandidate; + request->setArguments(arguments); + + QVariant keySequenceProcessed; + bool requestOk = request->send(keySequenceProcessed); + if (requestOk && keySequenceProcessed.toBool()) { + mDialpad->editor().setText(QString("")); + } } } #else @@ -94,22 +96,56 @@ /*! - DialpadKeySequenceEventFilter::preValidateKeySequence. - Checks that key sequence starts with '*#'and ends with '#'. + DialpadKeySequenceEventFilter::constructKeySequenceToHandlerMappings. */ -bool DialpadKeySequenceEventFilter::preValidateKeySequence( - const QString &sequence) +void DialpadKeySequenceEventFilter::constructKeySequenceToHandlerMappings() { - const int KMinimumLength = 4; - bool isValid = false; + PHONE_TRACE; + + QList implementations = mAiwMgr.list( + "com.nokia.symbian.IKeySequenceRecognition", + ""); - int lengthOfSequence = sequence.length(); - if (KMinimumLength <= lengthOfSequence) { - isValid = - (sequence.at(0) == '*') && - (sequence.at(1) == '#') && - (sequence.at(lengthOfSequence - 1) == '#'); + foreach (XQAiwInterfaceDescriptor d, implementations) + { + QScopedPointer request(mAiwMgr.create( + d, + "keySequenceValidator()", + false)); + request->setSynchronous(true); + request->setBackground(true); + + QVariant keySequenceValidator; + bool requestOk = request->send(keySequenceValidator); + if (requestOk && keySequenceValidator.toString().size()) { + QString validator = keySequenceValidator.toString(); + mValidators[validator] = d; + } + } +} + + +/*! + DialpadKeySequenceEventFilter::findKeySequenceHandler. + */ +XQAiwInterfaceDescriptor DialpadKeySequenceEventFilter::findKeySequenceHandler( + const QString &keySequenceCandidate) +{ + PHONE_TRACE; + + XQAiwInterfaceDescriptor keySequenceHandler; + + QList validatorExpressions = mValidators.keys(); + QList::const_iterator it; + for (it = validatorExpressions.constBegin(); + (it != validatorExpressions.constEnd()) && (!keySequenceHandler.isValid()); + ++it) { + QString validatorExpression = *it; + QRegExp expression(validatorExpression); + if (expression.exactMatch(keySequenceCandidate)) { + keySequenceHandler = mValidators.value(*it); + } } - return isValid; + return keySequenceHandler; } diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - -]> - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - -]> - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_b.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_b.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_c.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_c.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_t.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_t.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_swipe.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_swipe.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_answer_call.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_answer_call.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg --- a/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - - - -]> - - - - - - diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.cpp --- a/telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -27,6 +27,7 @@ #include #include "dialpadtest.h" +#include "dialpadtestutil.h" #include "dialpad.h" const int WAIT_TIME = 300; @@ -62,14 +63,6 @@ { Q_OBJECT -public: - enum MouseEventType - { - Press, - Release, - Click - }; - private slots: void initTestCase(); void cleanupTestCase(); @@ -91,15 +84,10 @@ #endif private: - QGraphicsWidget* getWidgetByName(const QString& name); - void mouseClickDialpad(int key, MouseEventType type=Click, - bool pause=true); - -private: HbMainWindow* mMainWindow; Dialpad* mDialpad; KeyEventCatcher* mKeyCatcher; - QMap mKeyNames; + DialpadTestUtil* mUtil; }; void mt_Dialpad::initTestCase() @@ -109,6 +97,8 @@ mKeyCatcher = new KeyEventCatcher; mMainWindow->installEventFilter(mKeyCatcher); + mUtil = new DialpadTestUtil(*mMainWindow); + mDialpad = new Dialpad(*mMainWindow); QRectF rect(mMainWindow->contentsRect()); @@ -119,21 +109,6 @@ mMainWindow->layoutRect().height()/2); mDialpad->setPos(0,mMainWindow->layoutRect().height()/4); - mKeyNames.insert(Qt::Key_1,"49"); - mKeyNames.insert(Qt::Key_2,"50"); - mKeyNames.insert(Qt::Key_3,"51"); - mKeyNames.insert(Qt::Key_4,"52"); - mKeyNames.insert(Qt::Key_5,"53"); - mKeyNames.insert(Qt::Key_6,"54"); - mKeyNames.insert(Qt::Key_7,"55"); - mKeyNames.insert(Qt::Key_8,"56"); - mKeyNames.insert(Qt::Key_9,"57"); - mKeyNames.insert(Qt::Key_Asterisk,"42"); - mKeyNames.insert(Qt::Key_0,"48"); - mKeyNames.insert(Qt::Key_NumberSign,"35"); - mKeyNames.insert(Qt::Key_Backspace,"16777219"); - mKeyNames.insert(Qt::Key_Yes,"16842753"); - mMainWindow->show(); mDialpad->show(); mDialpad->hide(); @@ -144,6 +119,7 @@ delete mDialpad; delete mMainWindow; delete mKeyCatcher; + delete mUtil; } void mt_Dialpad::cleanup() @@ -154,56 +130,6 @@ QTest::qWait( WAIT_TIME ); // delay between tests } -QGraphicsWidget* mt_Dialpad::getWidgetByName(const QString& name) -{ - Q_ASSERT(mMainWindow!=0); - - QGraphicsWidget* widget = 0; - - QList items = mMainWindow->scene()->items(); - foreach (QGraphicsItem* item, items) { - if (item->isWidget()) { - QGraphicsWidget *w = static_cast(item); - if (w->objectName()==name) { - widget = w; - } - } - } - - return widget; -} - -void mt_Dialpad::mouseClickDialpad(int key, MouseEventType type, bool pause) -{ - QString name = mKeyNames.value(key); - - QGraphicsWidget* widget = getWidgetByName(name); - - if ( widget ) { - QPointF widgetPos = widget->scenePos() + - widget->rect().center(); - - QPoint windowPos = mMainWindow->mapFromScene( widgetPos ); - - if (type==Press) { - QTest::mousePress( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } else if (type==Release) { - QTest::mouseRelease( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } else { - QTest::mouseClick( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } - - if (pause) { - QTest::qWait( WAIT_TIME ); - } - } else { - QFAIL( "Button could not be accessed!" ); - } -} - void mt_Dialpad::testNumericButtons() { QSignalSpy aboutToOpenSpy( mDialpad, SIGNAL(aboutToOpen())); @@ -215,18 +141,18 @@ QVERIFY(aboutToOpenSpy.count()==1); QTest::qWait( 2*WAIT_TIME ); - mouseClickDialpad(Qt::Key_1); - mouseClickDialpad(Qt::Key_2); - mouseClickDialpad(Qt::Key_3); - mouseClickDialpad(Qt::Key_4); - mouseClickDialpad(Qt::Key_5); - mouseClickDialpad(Qt::Key_6); - mouseClickDialpad(Qt::Key_7); - mouseClickDialpad(Qt::Key_8); - mouseClickDialpad(Qt::Key_9); - mouseClickDialpad(Qt::Key_Asterisk); - mouseClickDialpad(Qt::Key_0); - mouseClickDialpad(Qt::Key_NumberSign); + mUtil->mouseClickDialpad(Qt::Key_1); + mUtil->mouseClickDialpad(Qt::Key_2); + mUtil->mouseClickDialpad(Qt::Key_3); + mUtil->mouseClickDialpad(Qt::Key_4); + mUtil->mouseClickDialpad(Qt::Key_5); + mUtil->mouseClickDialpad(Qt::Key_6); + mUtil->mouseClickDialpad(Qt::Key_7); + mUtil->mouseClickDialpad(Qt::Key_8); + mUtil->mouseClickDialpad(Qt::Key_9); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_0); + mUtil->mouseClickDialpad(Qt::Key_NumberSign); QVERIFY(mDialpad->editor().text()=="123456789*0#"); @@ -245,9 +171,9 @@ { mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_1, Press); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press); QTest::qWait( LONGPRESS_DURATION ); - mouseClickDialpad(Qt::Key_1, Release); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release); QVERIFY(mDialpad->editor().text()=="1"); mDialpad->closeDialpad(); } @@ -256,9 +182,9 @@ { mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_1); + mUtil->mouseClickDialpad(Qt::Key_1); QVERIFY(mDialpad->editor().text()=="1"); - mouseClickDialpad(Qt::Key_Backspace); + mUtil->mouseClickDialpad(Qt::Key_Backspace); QVERIFY(mDialpad->editor().text()==""); QVERIFY(mKeyCatcher->mKeyPresses.count()==2); QVERIFY(mKeyCatcher->mKeyReleases.count()==2); @@ -266,13 +192,13 @@ QVERIFY(mKeyCatcher->mKeyReleases.at(1)==Qt::Key_Backspace); // test repeats QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_1); - mouseClickDialpad(Qt::Key_2); - mouseClickDialpad(Qt::Key_3); + mUtil->mouseClickDialpad(Qt::Key_1); + mUtil->mouseClickDialpad(Qt::Key_2); + mUtil->mouseClickDialpad(Qt::Key_3); QVERIFY(mDialpad->editor().text()=="123"); - mouseClickDialpad(Qt::Key_Backspace,Press); + mUtil->mouseClickDialpad(Qt::Key_Backspace, DialpadTestUtil::Press); QTest::qWait( 1500 ); - mouseClickDialpad(Qt::Key_Backspace,Release); + mUtil->mouseClickDialpad(Qt::Key_Backspace, DialpadTestUtil::Release); QVERIFY(mDialpad->editor().text()==""); mDialpad->closeDialpad(); } @@ -281,13 +207,13 @@ { mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QVERIFY(mDialpad->editor().text()=="*"); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QVERIFY(mDialpad->editor().text()=="+"); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QVERIFY(mDialpad->editor().text()=="p"); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QVERIFY(mDialpad->editor().text()=="w"); QVERIFY(mKeyCatcher->mKeyPresses.count()==4); @@ -299,21 +225,21 @@ // Verify that the second char can't be + QTest::qWait(1000); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QCOMPARE(mDialpad->editor().text(), QString("w*")); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QCOMPARE(mDialpad->editor().text(), QString("wp")); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QCOMPARE(mDialpad->editor().text(), QString("ww")); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QCOMPARE(mDialpad->editor().text(), QString("w*")); // test entering two asterisk QTest::qWait(1000); mDialpad->editor().setText(QString()); - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QTest::qWait( 1000 ); // longer than short tap - mouseClickDialpad(Qt::Key_Asterisk); + mUtil->mouseClickDialpad(Qt::Key_Asterisk); QCOMPARE(mDialpad->editor().text(), QString("**")); mDialpad->closeDialpad(); @@ -324,11 +250,11 @@ mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); mDialpad->setCallButtonEnabled(false); - mouseClickDialpad(Qt::Key_Yes); + mUtil->mouseClickDialpad(Qt::Key_Yes); QVERIFY(mKeyCatcher->mKeyPresses.count()==0); QVERIFY(mKeyCatcher->mKeyReleases.count()==0); mDialpad->setCallButtonEnabled(true); - mouseClickDialpad(Qt::Key_Yes); + mUtil->mouseClickDialpad(Qt::Key_Yes); QTest::qWait( WAIT_TIME ); QVERIFY(mKeyCatcher->mKeyPresses.count()==1); QVERIFY(mKeyCatcher->mKeyReleases.count()==1); @@ -339,52 +265,23 @@ void mt_Dialpad::testCloseGesture() { - QSignalSpy aboutToCloseSpy( mDialpad, SIGNAL(aboutToClose())); - - mDialpad->openDialpad(); - - // slow swipe - QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_2, Press, false); - QTest::qWait( 500 ); // longer than swipe - mouseClickDialpad(Qt::Key_8, Release, false); - QTest::qWait( 500 ); - QVERIFY(mDialpad->isVisible()==true); - - // short swipe - QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_2, Press, false); - QTest::qWait( 200 ); - mouseClickDialpad(Qt::Key_5, Release, false); - QTest::qWait( 500 ); - QVERIFY(mDialpad->isVisible()==true); - - // ok swipe - mDialpad->editor().setText(QString()); - QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_2, Press, false); - QTest::qWait( 200 ); - mouseClickDialpad(Qt::Key_8, Release, false); - QVERIFY(mDialpad->editor().text()==""); - QTest::qWait( 1000 ); - QVERIFY(mDialpad->isVisible()==false); - QVERIFY(aboutToCloseSpy.count()==1); + // QTest::mouseMove() doesn't work } void mt_Dialpad::testOpenDialogWhileButtonPressed() { mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_5, Press); + mUtil->mouseClickDialpad(Qt::Key_5, DialpadTestUtil::Press); QTest::qWait( LONGPRESS_DURATION ); HbMessageBox* box = new HbMessageBox("Test dialog!"); + box->setAttribute(Qt::WA_DeleteOnClose); + box->setTimeout(1000); box->show(); QTest::qWait( 500 ); - - mouseClickDialpad(Qt::Key_5, Release); + mUtil->mouseClickDialpad(Qt::Key_5, DialpadTestUtil::Release); QTest::qWait( 100 ); - delete box; QVERIFY(mDialpad->editor().text()=="5"); QVERIFY(mKeyCatcher->mKeyPresses.at(0)==Qt::Key_5); @@ -422,6 +319,7 @@ #ifndef Q_OS_SYMBIAN void mt_Dialpad::testCloseGestureLandscape() { + /* // switch to landscape mMainWindow->setOrientation(Qt::Horizontal); mMainWindow->resize(640,360); @@ -435,33 +333,34 @@ // slow swipe QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_4, Press, false); + mUtil->mouseClickDialpad(Qt::Key_4, Press, false); QTest::qWait( 500 ); // longer than swipe - mouseClickDialpad(Qt::Key_6, Release, false); + mUtil->mouseClickDialpad(Qt::Key_6, Release, false); QTest::qWait( 500 ); QVERIFY(mDialpad->isVisible()==true); // short swipe QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_4, Press, false); + mUtil->mouseClickDialpad(Qt::Key_4, Press, false); QTest::qWait( 200 ); - mouseClickDialpad(Qt::Key_5, Release, false); + mUtil->mouseClickDialpad(Qt::Key_5, Release, false); QTest::qWait( 500 ); QVERIFY(mDialpad->isVisible()==true); // ok swipe mDialpad->editor().setText(QString()); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_4, Press, false); + mUtil->mouseClickDialpad(Qt::Key_4, Press, false); QTest::qWait( 200 ); - mouseClickDialpad(Qt::Key_6, Release, false); + mUtil->mouseClickDialpad(Qt::Key_6, Release, false); QVERIFY(mDialpad->editor().text()==""); QTest::qWait( 1000 ); - QVERIFY(mDialpad->isVisible()==false); + QVERIFY(mDialpad->isVisible()==false);*/ } void mt_Dialpad::testCloseGestureLandscapeMirrored() { + /* // switch to mirrored landscape mMainWindow->setOrientation(Qt::Horizontal); mMainWindow->resize(640,360); @@ -474,44 +373,64 @@ // slow swipe QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_4, Press, false); + mUtil->mouseClickDialpad(Qt::Key_4, Press, false); QTest::qWait( 500 ); // longer than swipe - mouseClickDialpad(Qt::Key_6, Release, false); + mUtil->mouseClickDialpad(Qt::Key_6, Release, false); QTest::qWait( WAIT_TIME ); QVERIFY(mDialpad->isVisible()==true); // short swipe QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_4, Press, false); + mUtil->mouseClickDialpad(Qt::Key_4, Press, false); QTest::qWait( 200 ); - mouseClickDialpad(Qt::Key_5, Release, false); + mUtil->mouseClickDialpad(Qt::Key_5, Release, false); QTest::qWait( 1000 ); QVERIFY(mDialpad->isVisible()==true); // ok swipe mDialpad->editor().setText(QString()); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_4, Press, false); + mUtil->mouseClickDialpad(Qt::Key_4, Press, false); QTest::qWait( 200 ); - mouseClickDialpad(Qt::Key_6, Release, false); + mUtil->mouseClickDialpad(Qt::Key_6, Release, false); QVERIFY(mDialpad->editor().text()==""); QTest::qWait( 1000 ); - QVERIFY(mDialpad->isVisible()==false); + QVERIFY(mDialpad->isVisible()==false);*/ } void mt_Dialpad::testOrientationChange() { mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); + + // test landscape mMainWindow->setLayoutDirection(Qt::LeftToRight); + mMainWindow->setOrientation(Qt::Horizontal); + mMainWindow->resize(640,360); + QTest::qWait( 1000 ); + mDialpad->setPreferredSize(mMainWindow->layoutRect().width()/2, + mMainWindow->layoutRect().height()); + mDialpad->setPos(mMainWindow->layoutRect().width()/2,0); + QTest::qWait( 1000 ); + + QVERIFY(mDialpad->isVisible()==true); + mUtil->mouseClickDialpad(Qt::Key_5); + QVERIFY(mDialpad->editor().text()=="5"); + QTest::qWait( 500 ); + + // test portrait mMainWindow->setOrientation(Qt::Vertical); mMainWindow->resize(360,640); - QTest::qWait( 1000 ); mDialpad->setPreferredSize(mMainWindow->layoutRect().width(), mMainWindow->layoutRect().height()/2); mDialpad->setPos(0,mMainWindow->layoutRect().height()/4); QTest::qWait( 1000 ); + QVERIFY(mDialpad->isVisible()==true); + mDialpad->editor().setText(""); + mUtil->mouseClickDialpad(Qt::Key_5); + QVERIFY(mDialpad->editor().text()=="5"); + mDialpad->closeDialpad(); QTest::qWait( 500 ); QVERIFY(mDialpad->isVisible()==false); diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.pro --- a/telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.pro Wed Jun 23 18:49:32 2010 +0300 @@ -29,7 +29,8 @@ } # -SOURCES += mt_dialpad.cpp +HEADERS += ../shared/dialpadtestutil.h +SOURCES += mt_dialpad.cpp ../shared/dialpadtestutil.cpp # LIBS += -ldialpad diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.cpp --- a/telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -36,12 +36,12 @@ QObject* mParameter2; #ifdef Q_OS_SYMBIAN -DialpadVoiceMailboxEventFilter::DialpadVoiceMailboxEventFilter(Dialpad* dialPad, QObject* parent) +/*DialpadVoiceMailboxEventFilter::DialpadVoiceMailboxEventFilter(Dialpad* dialPad, QObject* parent) { mVmbxFilterConstructed = true; mParameter1 = dialPad; mParameter2 = parent; -} +}*/ #endif // test cases @@ -65,9 +65,9 @@ mDialpad = new Dialpad(*mMainWindow); mKeyhandler = new DialpadKeyHandler(mDialpad, *hbInstance->allMainWindows().at(0), this); QVERIFY(mKeyhandler != NULL); - QVERIFY(mVmbxFilterConstructed == true); - QVERIFY(mParameter1 == mDialpad); - QVERIFY(mParameter2 == this); + //QVERIFY(mVmbxFilterConstructed == true); + //QVERIFY(mParameter1 == mDialpad); + //QVERIFY(mParameter2 == this); } void mt_KeyHandler::cleanup() diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/shared/dialpadtestutil.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/shared/dialpadtestutil.cpp Wed Jun 23 18:49:32 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 "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Dialpad test utility +* +*/ + +#include +#include +#include + +#include "dialpadtestutil.h" + +const int WAIT_TIME = 300; + +DialpadTestUtil::DialpadTestUtil(HbMainWindow& mainWindow, QObject* parent) : + QObject(parent), mMainWindow(mainWindow) +{ + mKeyNames.insert(Qt::Key_1,"keypad"); + mKeyNames.insert(Qt::Key_2,"keypad"); + mKeyNames.insert(Qt::Key_3,"keypad"); + mKeyNames.insert(Qt::Key_4,"keypad"); + mKeyNames.insert(Qt::Key_5,"keypad"); + mKeyNames.insert(Qt::Key_6,"keypad"); + mKeyNames.insert(Qt::Key_7,"keypad"); + mKeyNames.insert(Qt::Key_8,"keypad"); + mKeyNames.insert(Qt::Key_9,"keypad"); + mKeyNames.insert(Qt::Key_Asterisk,"keypad"); + mKeyNames.insert(Qt::Key_0,"keypad"); + mKeyNames.insert(Qt::Key_NumberSign,"keypad"); + mKeyNames.insert(Qt::Key_Backspace,"16777219"); + mKeyNames.insert(Qt::Key_Yes,"16842753"); +} + +DialpadTestUtil::~DialpadTestUtil() +{ +} + +QGraphicsWidget* DialpadTestUtil::getWidgetByName(const QString& name) +{ + QGraphicsWidget* widget = 0; + + QList items = mMainWindow.scene()->items(); + foreach (QGraphicsItem* item, items) { + if (item->isWidget()) { + QGraphicsWidget *w = static_cast(item); + if (w->objectName()==name) { + widget = w; + } + } + } + + return widget; +} + +QPointF DialpadTestUtil::keyPosition(QGraphicsWidget* widget, int key) +{ + QPointF keyPos; + QRectF rect = widget->rect(); + + // 3 x 4 grid + int cellWidth = rect.width() / 3; + int cellHeight = rect.height() / 4; + + if (key==Qt::Key_Asterisk) { + keyPos = QPointF( 0.5 * cellWidth, 3.5 * cellHeight ); + } else if (key==Qt::Key_NumberSign) { + keyPos = QPointF( 2.5 * cellWidth, 3.5 * cellHeight ); + } else if (key==Qt::Key_0) { + keyPos = QPointF( 1.5 * cellWidth, 3.5 * cellHeight ); + } else { + int normalized = key - 49; + // qDebug() << normalized; + int column = normalized % 3; + int row = (normalized / 3); + // qDebug() << column << row; + + keyPos = QPointF((column+0.5)*cellWidth,(row+0.5)*cellHeight); + } + + return keyPos; +} + +void DialpadTestUtil::mouseClickDialpad(int key, MouseEventType type, bool pause) +{ + QString name = mKeyNames.value(key); + + QGraphicsWidget* widget = getWidgetByName(name); + + if ( widget ) { + QPointF widgetPos; + + if (name=="keypad") { + widgetPos = widget->scenePos() + + keyPosition(widget, key); + } else { + widgetPos = widget->scenePos() + + widget->rect().center(); + } + + QPoint windowPos = mMainWindow.mapFromScene( widgetPos ); + + if (type==Press) { + QTest::mousePress( mMainWindow.viewport(), Qt::LeftButton, + 0, windowPos ); + } else if (type==Release) { + QTest::mouseRelease( mMainWindow.viewport(), Qt::LeftButton, + 0, windowPos ); + } else { + QTest::mouseClick( mMainWindow.viewport(), Qt::LeftButton, + 0, windowPos ); + } + + if (pause) { + QTest::qWait( WAIT_TIME ); + } + } else { + QFAIL( "Button could not be accessed!" ); + } +} + + diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/shared/dialpadtestutil.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/shared/dialpadtestutil.h Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,54 @@ +/*! +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Dialpad test utility +* +*/ + +#ifndef DIALPADTESTUTIL_H +#define DIALPADTESTUTIL_H + +#include +#include +#include +#include + +class HbMainWindow; + +class DialpadTestUtil : public QObject +{ + +public: + enum MouseEventType + { + Press, + Release, + Click + }; + +public: + explicit DialpadTestUtil(HbMainWindow& mainWindow, QObject* parent=0); + ~DialpadTestUtil(); + + void mouseClickDialpad(int key, MouseEventType type=Click, bool pause=true); + +private: + QGraphicsWidget* getWidgetByName(const QString& name); + QPointF keyPosition(QGraphicsWidget* widget, int key); + +private: + QMap mKeyNames; + HbMainWindow& mMainWindow; +}; + +#endif // DIALPADTESTUTIL_H diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/shared/mock_dialpad.cpp --- a/telutils/dialpad/tsrc/unit/shared/mock_dialpad.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/shared/mock_dialpad.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -45,7 +45,6 @@ mInputField(0), mKeypad(0), mMultitap(0), - mMouseButtonPressedDown(false), mOpenTimeLine(DialpadOpenAnimDuration), mCloseTimeLine(DialpadCloseAnimDuration), mAnimationOngoing(false), @@ -69,7 +68,6 @@ mInputField(0), mKeypad(0), mMultitap(0), - mMouseButtonPressedDown(false), mOpenTimeLine(DialpadOpenAnimDuration), mCloseTimeLine(DialpadCloseAnimDuration), mAnimationOngoing(false), @@ -168,42 +166,6 @@ QWidget *, widget ) } - -// ----------------------------------------------------------------------------- -// Dialpad::sceneEvent -// ----------------------------------------------------------------------------- -// -bool Dialpad::sceneEvent( - QEvent * event ) - { - SMC_MOCK_METHOD1( bool, QEvent *, event ) - } - - -// ----------------------------------------------------------------------------- -// Dialpad::sceneEventFilter -// ----------------------------------------------------------------------------- -// -bool Dialpad::sceneEventFilter( - QGraphicsItem * watched, - QEvent * event ) - { - SMC_MOCK_METHOD2( bool, QGraphicsItem *, watched, - QEvent *, event ) - } - - -// ----------------------------------------------------------------------------- -// Dialpad::handleSceneEvent -// ----------------------------------------------------------------------------- -// -bool Dialpad::handleSceneEvent( - QEvent * event ) - { - SMC_MOCK_METHOD1( bool, QEvent *, event ) - } - - // ----------------------------------------------------------------------------- // Dialpad::showEvent // ----------------------------------------------------------------------------- @@ -299,4 +261,13 @@ SMC_MOCK_METHOD1( void, Qt::Orientation, current ) } +// ----------------------------------------------------------------------------- +// Dialpad::gestureEvent +// ----------------------------------------------------------------------------- +// +void Dialpad::gestureEvent(QGestureEvent *event) + { + SMC_MOCK_METHOD1( void, QGestureEvent *, event ) + } + diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/shared/mock_hbmainwindow.cpp --- a/telutils/dialpad/tsrc/unit/shared/mock_hbmainwindow.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/shared/mock_hbmainwindow.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -14,27 +14,17 @@ * Description: * */ + +#include #include #include #include +#include +#include // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- -// HbMainWindow::HbMainWindow -// ----------------------------------------------------------------------------- -// -HbMainWindow::HbMainWindow( - QWidget * parent, - Hb::WindowFlags windowFlags ) - : d_ptr(NULL) - //QGraphicsView( /*parent, windowFlags*/ ) - { - Q_UNUSED(parent) - Q_UNUSED(windowFlags) - } - -// ----------------------------------------------------------------------------- // HbMainWindow::~HbMainWindow // ----------------------------------------------------------------------------- // @@ -44,61 +34,6 @@ } - -// ----------------------------------------------------------------------------- -// HbMainWindow::removeView -// ----------------------------------------------------------------------------- -// -QGraphicsWidget * HbMainWindow::removeView( - int index ) - { - SMC_MOCK_METHOD1( QGraphicsWidget *, int, index ) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::currentViewIndex -// ----------------------------------------------------------------------------- -// -int HbMainWindow::currentViewIndex( ) const - { - SMC_MOCK_METHOD0( int ) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::viewCount -// ----------------------------------------------------------------------------- -// -int HbMainWindow::viewCount( ) const - { - SMC_MOCK_METHOD0( int ) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::indexOfView -// ----------------------------------------------------------------------------- -// -int HbMainWindow::indexOfView( - HbView * view ) const - { - //SMC_MOCK_METHOD1( int, HbView *, view ) - Q_UNUSED(view) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::viewAt -// ----------------------------------------------------------------------------- -// -HbView * HbMainWindow::viewAt( - int index ) const - { - SMC_MOCK_METHOD1( HbView *, int, index ) - } - - // ----------------------------------------------------------------------------- // HbMainWindow::addView // ----------------------------------------------------------------------------- @@ -106,9 +41,10 @@ HbView * HbMainWindow::addView( QGraphicsWidget * widget ) { - //SMC_MOCK_METHOD1( HbView *, QGraphicsWidget *, widget ) - Q_UNUSED(widget) + SMC_MOCK_METHOD1( HbView *, QGraphicsWidget *, widget ) } + + // ----------------------------------------------------------------------------- // HbMainWindow::insertView // ----------------------------------------------------------------------------- @@ -117,10 +53,8 @@ int index, QGraphicsWidget * widget ) { - //SMC_MOCK_METHOD2( HbView *, int, index, - // QGraphicsWidget *, widget ) - Q_UNUSED(index) - Q_UNUSED(widget) + SMC_MOCK_METHOD2( HbView *, int, index, + QGraphicsWidget *, widget ) } @@ -131,8 +65,7 @@ void HbMainWindow::removeView( QGraphicsWidget * widget ) { - //SMC_MOCK_METHOD1( void, QGraphicsWidget *, widget ) - Q_UNUSED(widget) + SMC_MOCK_METHOD1( void, QGraphicsWidget *, widget ) } @@ -142,7 +75,7 @@ // QList HbMainWindow::views( ) const { - //SMC_MOCK_METHOD0( QList ) + SMC_MOCK_METHOD0( QList ) } @@ -165,16 +98,9 @@ bool animate, Hb::ViewSwitchFlags flags ) { - //SMC_MOCK_METHOD3( void, HbView *, view, - // bool, animate, - // Hb::ViewSwitchFlags, flags ) - Q_UNUSED(view) - Q_UNUSED(animate) - Q_UNUSED(flags) } - // ----------------------------------------------------------------------------- // HbMainWindow::orientation // ----------------------------------------------------------------------------- @@ -193,10 +119,8 @@ Qt::Orientation orientation, bool animate ) { - //SMC_MOCK_METHOD2( void, Qt::Orientation, orientation, - // bool, animate ) - Q_UNUSED(orientation) - Q_UNUSED(animate) + SMC_MOCK_METHOD2( void, Qt::Orientation, orientation, + bool, animate ) } @@ -212,67 +136,6 @@ // ----------------------------------------------------------------------------- -// HbMainWindow::showItems -// ----------------------------------------------------------------------------- -// -void HbMainWindow::showItems( - Hb::SceneItems items ) - { - //SMC_MOCK_METHOD1( void, Hb::SceneItems, items ) - Q_UNUSED(items) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::hideItems -// ----------------------------------------------------------------------------- -// -void HbMainWindow::hideItems( - Hb::SceneItems items ) - { - //SMC_MOCK_METHOD1( void, Hb::SceneItems, items ) - Q_UNUSED(items) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::visibleItems -// ----------------------------------------------------------------------------- -// -Hb::SceneItems HbMainWindow::visibleItems( ) const - { - SMC_MOCK_METHOD0( Hb::SceneItems ) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::isItemVisible -// ----------------------------------------------------------------------------- -// -bool HbMainWindow::isItemVisible( - Hb::SceneItem item ) const - { - //SMC_MOCK_METHOD1( bool, Hb::SceneItem, item ) - Q_UNUSED(item) - } - - -// ----------------------------------------------------------------------------- -// HbMainWindow::setItemVisible -// ----------------------------------------------------------------------------- -// -void HbMainWindow::setItemVisible( - Hb::SceneItem item, - bool visible ) - { - //SMC_MOCK_METHOD2( void, Hb::SceneItem, item, - // bool, visible ) - Q_UNUSED(item) - Q_UNUSED(visible) - } - - -// ----------------------------------------------------------------------------- // HbMainWindow::nativeBackgroundWindow // ----------------------------------------------------------------------------- // @@ -310,10 +173,8 @@ Qt::Orientation orientation, const QString & name ) { - //SMC_MOCK_METHOD2( void, Qt::Orientation, orientation, - // const QString &, name ) - Q_UNUSED(orientation) - Q_UNUSED(name) + SMC_MOCK_METHOD2( void, Qt::Orientation, orientation, + const QString &, name ) } @@ -324,39 +185,49 @@ QString HbMainWindow::backgroundImageName( Qt::Orientation orientation ) const { - //SMC_MOCK_METHOD1( QString, Qt::Orientation, orientation ) - Q_UNUSED(orientation) + SMC_MOCK_METHOD1( QString, Qt::Orientation, orientation ) } // ----------------------------------------------------------------------------- -// HbMainWindow::setCurrentViewIndex +// HbMainWindow::setBackgroundImageMode // ----------------------------------------------------------------------------- // -void HbMainWindow::setCurrentViewIndex( - int index ) +void HbMainWindow::setBackgroundImageMode( + Hb::BackgroundImageMode mode ) { - SMC_MOCK_METHOD1( void, int, index ) + SMC_MOCK_METHOD1( void, Hb::BackgroundImageMode, mode ) } // ----------------------------------------------------------------------------- -// HbMainWindow::nextView +// HbMainWindow::backgroundImageMode // ----------------------------------------------------------------------------- // -void HbMainWindow::nextView( ) +Hb::BackgroundImageMode HbMainWindow::backgroundImageMode( ) const { - SMC_MOCK_METHOD0( void ) + SMC_MOCK_METHOD0( Hb::BackgroundImageMode ) } // ----------------------------------------------------------------------------- -// HbMainWindow::previousView +// HbMainWindow::setAutomaticOrientationEffectEnabled // ----------------------------------------------------------------------------- // -void HbMainWindow::previousView( ) +void HbMainWindow::setAutomaticOrientationEffectEnabled( + bool enabled ) { - SMC_MOCK_METHOD0( void ) + SMC_MOCK_METHOD1( void, bool, enabled ) + } + + +// ----------------------------------------------------------------------------- +// HbMainWindow::automaticOrientationEffectEnabled +// ----------------------------------------------------------------------------- +// +bool HbMainWindow::automaticOrientationEffectEnabled( ) const + { + SMC_MOCK_METHOD0( bool ) } @@ -372,17 +243,6 @@ // ----------------------------------------------------------------------------- -// HbMainWindow::currentViewIndexChanged -// ----------------------------------------------------------------------------- -// -void HbMainWindow::currentViewIndexChanged( - int index ) - { - SMC_MOCK_METHOD1( void, int, index ) - } - - -// ----------------------------------------------------------------------------- // HbMainWindow::viewReady // ----------------------------------------------------------------------------- // @@ -400,10 +260,8 @@ HbView * oldView, HbView * newView ) { - //SMC_MOCK_METHOD2( void, HbView *, oldView, - // HbView *, newView ) - Q_UNUSED(oldView) - Q_UNUSED(newView) + SMC_MOCK_METHOD2( void, HbView *, oldView, + HbView *, newView ) } @@ -414,8 +272,7 @@ void HbMainWindow::currentViewChanged( HbView * view ) { - //SMC_MOCK_METHOD1( void, HbView *, view ) - Q_UNUSED(view) + SMC_MOCK_METHOD1( void, HbView *, view ) } @@ -437,10 +294,8 @@ Qt::Orientation newOrientation, bool animated ) { - //SMC_MOCK_METHOD2( void, Qt::Orientation, newOrientation, - // bool, animated ) - Q_UNUSED(newOrientation) - Q_UNUSED(animated) + SMC_MOCK_METHOD2( void, Qt::Orientation, newOrientation, + bool, animated ) } @@ -451,8 +306,7 @@ void HbMainWindow::orientationChanged( Qt::Orientation orientation ) { - //SMC_MOCK_METHOD1( void, Qt::Orientation, orientation ) - Q_UNUSED(orientation) + SMC_MOCK_METHOD1( void, Qt::Orientation, orientation ) } @@ -463,8 +317,7 @@ void HbMainWindow::changeEvent( QEvent * event ) { - //SMC_MOCK_METHOD1( void, QEvent *, event ) - Q_UNUSED(event) + SMC_MOCK_METHOD1( void, QEvent *, event ) } @@ -475,8 +328,7 @@ void HbMainWindow::closeEvent( QCloseEvent * event ) { - //SMC_MOCK_METHOD1( void, QCloseEvent *, event ) - Q_UNUSED(event) + SMC_MOCK_METHOD1( void, QCloseEvent *, event ) } @@ -487,8 +339,7 @@ void HbMainWindow::keyPressEvent( QKeyEvent * event ) { - //SMC_MOCK_METHOD1( void, QKeyEvent *, event ) - Q_UNUSED(event) + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) } @@ -499,8 +350,7 @@ void HbMainWindow::keyReleaseEvent( QKeyEvent * event ) { - //SMC_MOCK_METHOD1( void, QKeyEvent *, event ) - Q_UNUSED(event) + SMC_MOCK_METHOD1( void, QKeyEvent *, event ) } @@ -511,8 +361,7 @@ void HbMainWindow::resizeEvent( QResizeEvent * event ) { - //SMC_MOCK_METHOD1( void, QResizeEvent *, event ) - Q_UNUSED(event) + SMC_MOCK_METHOD1( void, QResizeEvent *, event ) } @@ -523,8 +372,7 @@ void HbMainWindow::customEvent( QEvent * event ) { - //SMC_MOCK_METHOD1( void, QEvent *, event ) - Q_UNUSED(event) + SMC_MOCK_METHOD1( void, QEvent *, event ) } @@ -548,8 +396,18 @@ void HbMainWindow::paintEvent( QPaintEvent * event ) { - //SMC_MOCK_METHOD1( void, QPaintEvent *, event ) - Q_UNUSED(event) + SMC_MOCK_METHOD1( void, QPaintEvent *, event ) } +// ----------------------------------------------------------------------------- +// HbMainWindow::showEvent +// ----------------------------------------------------------------------------- +// +void HbMainWindow::showEvent( + QShowEvent * event ) + { + SMC_MOCK_METHOD1( void, QShowEvent *, event ) + } + + diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp --- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -31,6 +31,7 @@ #endif #include "dialpadtest.h" +#include "dialpadtestutil.h" #include "dialpadbluetootheventfilter.h" #include "dialpad.h" @@ -77,14 +78,6 @@ { Q_OBJECT -public: - enum MouseEventType - { - Press, - Release, - Click - }; - private slots: void initTestCase(); void init(); @@ -94,15 +87,11 @@ void testShortAndLongPressAsteriskKey(); private: - QGraphicsWidget* getWidgetByName(const QString& name); - void mouseClickDialpad(int key, MouseEventType type=Click, bool pause=true); - -private: HbMainWindow* mMainWindow; Dialpad* mDialpad; DialpadBluetoothEventFilter *mEventFilter; KeyEventCatcher* mKeyCatcher; - QMap mKeyNames; + DialpadTestUtil* mUtil; }; void ut_DialpadBluetoothEventFilter::initTestCase() @@ -112,6 +101,8 @@ mKeyCatcher = new KeyEventCatcher; mMainWindow->installEventFilter(mKeyCatcher); + mUtil = new DialpadTestUtil(*mMainWindow); + mDialpad = new Dialpad(); mEventFilter = new DialpadBluetoothEventFilter(mDialpad, this); hbInstance->allMainWindows().at(0)->installEventFilter(mEventFilter); @@ -123,21 +114,6 @@ mDialpad->setPreferredSize(360,400); mDialpad->setPos(0,100); - mKeyNames.insert(Qt::Key_1,"49"); - mKeyNames.insert(Qt::Key_2,"50"); - mKeyNames.insert(Qt::Key_3,"51"); - mKeyNames.insert(Qt::Key_4,"52"); - mKeyNames.insert(Qt::Key_5,"53"); - mKeyNames.insert(Qt::Key_6,"54"); - mKeyNames.insert(Qt::Key_7,"55"); - mKeyNames.insert(Qt::Key_8,"56"); - mKeyNames.insert(Qt::Key_9,"57"); - mKeyNames.insert(Qt::Key_Asterisk,"42"); - mKeyNames.insert(Qt::Key_0,"48"); - mKeyNames.insert(Qt::Key_NumberSign,"35"); - mKeyNames.insert(Qt::Key_Backspace,"16777219"); - mKeyNames.insert(Qt::Key_Yes,"16842753"); - mMainWindow->show(); mDialpad->show(); mDialpad->hide(); @@ -156,6 +132,7 @@ delete mDialpad; delete mMainWindow; delete mKeyCatcher; + delete mUtil; } void ut_DialpadBluetoothEventFilter::cleanup() @@ -166,61 +143,15 @@ QTest::qWait(WAIT_TIME); // delay between tests } -QGraphicsWidget* ut_DialpadBluetoothEventFilter::getWidgetByName(const QString& name) -{ - Q_ASSERT(mMainWindow!=0); - - QGraphicsWidget* widget = 0; - - QList items = mMainWindow->scene()->items(); - foreach (QGraphicsItem* item, items) { - if (item->isWidget()) { - QGraphicsWidget *w = static_cast(item); - if (w->objectName()==name) { - widget = w; - } - } - } - - return widget; -} - -void ut_DialpadBluetoothEventFilter::mouseClickDialpad(int key, MouseEventType type, bool pause) -{ - QString name = mKeyNames.value(key); - - QGraphicsWidget* widget = getWidgetByName(name); - - if (widget) { - QPointF widgetPos = widget->scenePos() + widget->rect().center(); - - QPoint windowPos = mMainWindow->mapFromScene(widgetPos); - - if (type==Press) { - QTest::mousePress(mMainWindow->viewport(), Qt::LeftButton, 0, windowPos); - } else if (type==Release) { - QTest::mouseRelease(mMainWindow->viewport(), Qt::LeftButton, 0, windowPos); - } else { - QTest::mouseClick(mMainWindow->viewport(), Qt::LeftButton, 0, windowPos); - } - - if (pause) { - QTest::qWait(WAIT_TIME); - } - } else { - QFAIL("Button could not be accessed!"); - } -} - void ut_DialpadBluetoothEventFilter::testLongPressAsteriskKey() { mDialpad->openDialpad(); QTest::qWait(2*WAIT_TIME); // Basic long press - mouseClickDialpad(Qt::Key_Asterisk, Press); + mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Press); QTest::qWait(2000); - mouseClickDialpad(Qt::Key_Asterisk, Release); + mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Release); QTest::qWait(1000); QCOMPARE(mDialpad->editor().text(), QString("")); mDialpad->closeDialpad(); @@ -236,11 +167,11 @@ mDialpad->openDialpad(); // Short press and long press shouldn't do anything - mouseClickDialpad(Qt::Key_Asterisk, Press); - mouseClickDialpad(Qt::Key_Asterisk, Release); - mouseClickDialpad(Qt::Key_Asterisk, Press); + mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Press); + mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Release); + mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Press); QTest::qWait(2000); - mouseClickDialpad(Qt::Key_Asterisk, Release); + mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Release); QCOMPARE(mDialpad->editor().text(), QString("**")); mDialpad->closeDialpad(); } diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro --- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro Wed Jun 23 18:49:32 2010 +0300 @@ -29,10 +29,12 @@ } # -HEADERS += ../../../inc/dialpadbluetootheventfilter.h -HEADERS += xqservicerequest.h -SOURCES += ut_dialpadbluetootheventfilter.cpp -SOURCES += ../../../src/dialpadbluetootheventfilter.cpp +HEADERS += ../../../inc/dialpadbluetootheventfilter.h \ + xqservicerequest.h \ + dialpadtestutil.h +SOURCES += ut_dialpadbluetootheventfilter.cpp \ + ../../../src/dialpadbluetootheventfilter.cpp \ + ../shared/dialpadtestutil.cpp # LIBS += -ldialpad diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpademergencycalleventfilter/ut_dialpademergencycalleventfilter.cpp --- a/telutils/dialpad/tsrc/unit/ut_dialpademergencycalleventfilter/ut_dialpademergencycalleventfilter.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpademergencycalleventfilter/ut_dialpademergencycalleventfilter.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -31,6 +31,7 @@ #endif #include "dialpadtest.h" +#include "dialpadtestutil.h" #include "dialpademergencycalleventfilter.h" #include "dialpad.h" @@ -62,14 +63,10 @@ void testEmergencyCallEventFilter(); private: - QGraphicsWidget* getWidgetByName(const QString& name); - void mouseClickDialpad(int key, bool pause=true); - -private: HbMainWindow* mMainWindow; Dialpad* mDialpad; DialpadEmergencyCallEventFilter *mEventFilter; - QMap mKeyNames; + DialpadTestUtil* mUtil; }; void ut_DialpadEmergencyCallEventFilter::initTestCase() @@ -80,6 +77,8 @@ mEventFilter = new DialpadEmergencyCallEventFilter(mDialpad, this); //hbInstance->allMainWindows().at(0)->installEventFilter(mEventFilter); mMainWindow->installEventFilter(mEventFilter); + + mUtil = new DialpadTestUtil(*mMainWindow); QRectF rect(mMainWindow->contentsRect()); rect.setHeight(rect.height()*0.7); @@ -89,21 +88,6 @@ mMainWindow->layoutRect().height()/2); mDialpad->setPos(0,mMainWindow->layoutRect().height()/4); - mKeyNames.insert(Qt::Key_1,"49"); - mKeyNames.insert(Qt::Key_2,"50"); - mKeyNames.insert(Qt::Key_3,"51"); - mKeyNames.insert(Qt::Key_4,"52"); - mKeyNames.insert(Qt::Key_5,"53"); - mKeyNames.insert(Qt::Key_6,"54"); - mKeyNames.insert(Qt::Key_7,"55"); - mKeyNames.insert(Qt::Key_8,"56"); - mKeyNames.insert(Qt::Key_9,"57"); - mKeyNames.insert(Qt::Key_Asterisk,"42"); - mKeyNames.insert(Qt::Key_0,"48"); - mKeyNames.insert(Qt::Key_NumberSign,"35"); - mKeyNames.insert(Qt::Key_Backspace,"16777219"); - mKeyNames.insert(Qt::Key_Yes,"16842753"); - mMainWindow->show(); mDialpad->show(); mDialpad->hide(); @@ -121,6 +105,7 @@ { delete mDialpad; delete mMainWindow; + delete mUtil; } void ut_DialpadEmergencyCallEventFilter::cleanup() @@ -129,60 +114,18 @@ QTest::qWait( WAIT_TIME ); // delay between tests } -QGraphicsWidget* ut_DialpadEmergencyCallEventFilter::getWidgetByName(const QString& name) -{ - Q_ASSERT(mMainWindow!=0); - - QGraphicsWidget* widget = 0; - - QList items = mMainWindow->scene()->items(); - foreach (QGraphicsItem* item, items) { - if (item->isWidget()) { - QGraphicsWidget *w = static_cast(item); - if (w->objectName()==name) { - widget = w; - } - } - } - - return widget; -} - -void ut_DialpadEmergencyCallEventFilter::mouseClickDialpad(int key, bool pause) -{ - QString name = mKeyNames.value(key); - - QGraphicsWidget* widget = getWidgetByName(name); - - if ( widget ) { - QPointF widgetPos = widget->scenePos() + - widget->rect().center(); - - QPoint windowPos = mMainWindow->mapFromScene( widgetPos ); - - QTest::mouseClick( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - - if (pause) { - QTest::qWait( WAIT_TIME ); - } - } else { - QFAIL( "Button could not be accessed!" ); - } -} - void ut_DialpadEmergencyCallEventFilter::testEmergencyCallEventFilter() { mDialpad->openDialpad(); QTest::qWait(WAIT_TIME); - mouseClickDialpad(Qt::Key_1); + mUtil->mouseClickDialpad(Qt::Key_1); QTest::qWait(1000); - mouseClickDialpad(Qt::Key_1); + mUtil->mouseClickDialpad(Qt::Key_1); QTest::qWait(1000); - mouseClickDialpad(Qt::Key_2); + mUtil->mouseClickDialpad(Qt::Key_2); QTest::qWait(1000); - mouseClickDialpad(Qt::Key_Yes); + mUtil->mouseClickDialpad(Qt::Key_Yes); QTest::qWait(1000); mDialpad->closeDialpad(); diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpademergencycalleventfilter/ut_dialpademergencycalleventfilter.pro --- a/telutils/dialpad/tsrc/unit/ut_dialpademergencycalleventfilter/ut_dialpademergencycalleventfilter.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpademergencycalleventfilter/ut_dialpademergencycalleventfilter.pro Wed Jun 23 18:49:32 2010 +0300 @@ -31,10 +31,12 @@ } #ß -HEADERS += ../../../inc/dialpademergencycalleventfilter.h -HEADERS += xqservicerequest.h -SOURCES += ut_dialpademergencycalleventfilter.cpp -SOURCES += ../../../src/dialpademergencycalleventfilter.cpp +HEADERS += ../../../inc/dialpademergencycalleventfilter.h \ + xqservicerequest.h \ + ../shared/dialpadtestutil.h +SOURCES += ut_dialpademergencycalleventfilter.cpp \ + ../../../src/dialpademergencycalleventfilter.cpp \ + ../shared/dialpadtestutil.cpp # LIBS += -ldialpad diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.cpp --- a/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -20,31 +20,64 @@ #include #include #ifdef Q_OS_SYMBIAN -#include "xqservicerequest.h" +#include +#include #endif #include "ut_dialpadkeysequenceeventfilter.h" #include "dialpadtest.h" #include "dialpadkeysequenceeventfilter.h" #include "dialpad.h" +const QString KValidKeySequence("*#1#"); + +void setValidatorReturnValue(QVariant &returnValue) +{ + returnValue.setValue(QRegExp::escape(KValidKeySequence)); +} + UT_DialpadKeySequenceEventFilter::UT_DialpadKeySequenceEventFilter() + : + m_dialPad(0), + m_eventFilter(0), + m_lineEditMock(0) { } UT_DialpadKeySequenceEventFilter::~UT_DialpadKeySequenceEventFilter() { - + delete m_dialPad; + delete m_eventFilter; + delete m_lineEditMock; } void UT_DialpadKeySequenceEventFilter::init() { initialize(); + m_lineEditMock = new HbLineEdit(); + QT_TRAP_THROWING(SmcDefaultValue::SetL(*m_lineEditMock)) + + XQAiwInterfaceDescriptor descriptor; + QString dummyOperation; + bool isEmbedded = false; + QList interfaceList; + interfaceList.append(descriptor); + EXPECT(XQApplicationManager::list).returns(interfaceList); + QPointer aiwRequest(new XQAiwRequest( + descriptor, dummyOperation, isEmbedded)); + EXPECT(XQApplicationManager::create).returns(aiwRequest.data()); + EXPECT(XQAiwRequest::send) + .willOnce(invoke(setValidatorReturnValue)) + .returns(true); + SmcDefaultValue::SetL(QString()); HbMainWindow *dummyWindow = NULL; m_dialPad = new Dialpad(*dummyWindow); m_eventFilter = new DialpadKeySequenceEventFilter(m_dialPad); + + QVERIFY(aiwRequest.isNull()); + QVERIFY(verify()); } void UT_DialpadKeySequenceEventFilter::cleanup() @@ -52,34 +85,48 @@ reset(); SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); delete m_dialPad; m_dialPad = NULL; delete m_eventFilter; m_eventFilter = NULL; + delete m_lineEditMock; + m_lineEditMock = NULL; } #ifdef Q_OS_SYMBIAN + +void setServiceRequestReturnValue(QVariant & returnValue) +{ + returnValue.setValue(true); +} + void UT_DialpadKeySequenceEventFilter::eventFilterValidKeySequence() { - const QString KValidKeySequence("*#1#"); - HbLineEdit lineEdit; - EXPECT(Dialpad::editor).returns(&lineEdit); EXPECT(HbLineEdit::text).returns(KValidKeySequence); - EXPECT(XQServiceRequest::send).returns(true); + EXPECT(XQAiwInterfaceDescriptor::isValid).returns(false); + EXPECT(XQAiwInterfaceDescriptor::isValid).returns(true); + XQAiwInterfaceDescriptor dummyDescriptor; + QString dummyOperation; + QPointer aiwRequest(new XQAiwRequest( + dummyDescriptor, dummyOperation, false)); + EXPECT(XQApplicationManager::create).returns(aiwRequest.data()); + EXPECT(XQAiwRequest::send) + .willOnce(invoke(setServiceRequestReturnValue)) + .returns(true); QKeyEvent keyEvent( QEvent::KeyRelease, Qt::Key_NumberSign, Qt::NoModifier); bool filtered = m_eventFilter->eventFilter(m_dialPad, &keyEvent); QVERIFY(!filtered); + QVERIFY(aiwRequest.isNull()); QVERIFY(verify()); } void UT_DialpadKeySequenceEventFilter::eventFilterNotAKeyEvent() { - HbLineEdit lineEdit; - EXPECT(Dialpad::editor).returns(&lineEdit); - EXPECT(XQServiceRequest::send).times(0); + EXPECT(XQAiwRequest::send).times(0); QMouseEvent mouseEvent( QEvent::MouseMove, QPoint(), @@ -93,9 +140,7 @@ void UT_DialpadKeySequenceEventFilter::eventFilterNotAHashKey() { - HbLineEdit lineEdit; - EXPECT(Dialpad::editor).returns(&lineEdit); - EXPECT(XQServiceRequest::send).times(0); + EXPECT(XQAiwRequest::send).times(0); QKeyEvent keyEvent( QEvent::KeyRelease, Qt::Key_Escape, @@ -112,10 +157,8 @@ const QString KInvalidKeySequence3("**1234#"); const QString KInvalidKeySequence4("*#1234*"); - EXPECT(XQServiceRequest::send).times(0); + EXPECT(XQAiwRequest::send).times(0); - HbLineEdit lineEdit; - EXPECT(Dialpad::editor).returns(&lineEdit); EXPECT(HbLineEdit::text).returns(KInvalidKeySequence1); QKeyEvent keyEvent( QEvent::KeyRelease, @@ -124,23 +167,56 @@ bool filtered = m_eventFilter->eventFilter(m_dialPad, &keyEvent); QVERIFY(!filtered); - EXPECT(Dialpad::editor).returns(&lineEdit); EXPECT(HbLineEdit::text).returns(KInvalidKeySequence2); filtered = m_eventFilter->eventFilter(m_dialPad, &keyEvent); QVERIFY(!filtered); - EXPECT(Dialpad::editor).returns(&lineEdit); EXPECT(HbLineEdit::text).returns(KInvalidKeySequence3); filtered = m_eventFilter->eventFilter(m_dialPad, &keyEvent); QVERIFY(!filtered); - EXPECT(Dialpad::editor).returns(&lineEdit); EXPECT(HbLineEdit::text).returns(KInvalidKeySequence4); filtered = m_eventFilter->eventFilter(m_dialPad, &keyEvent); QVERIFY(!filtered); QVERIFY(verify()); } + +void UT_DialpadKeySequenceEventFilter::eventFilterServiceRequestFails() +{ + // Qt Highway error while issuing service request + EXPECT(HbLineEdit::text).returns(KValidKeySequence); + EXPECT(XQAiwInterfaceDescriptor::isValid).returns(false); + EXPECT(XQAiwInterfaceDescriptor::isValid).returns(true); + XQAiwInterfaceDescriptor dummyDescriptor; + QString dummyOperation; + QPointer aiwRequest1(new XQAiwRequest( + dummyDescriptor, dummyOperation, false)); + EXPECT(XQApplicationManager::create).returns(aiwRequest1.data()); + EXPECT(XQAiwRequest::send).returns(false); + QKeyEvent keyEvent( + QEvent::KeyRelease, + Qt::Key_NumberSign, + Qt::NoModifier); + bool filtered = m_eventFilter->eventFilter(m_dialPad, &keyEvent); + QVERIFY(!filtered); + QVERIFY(aiwRequest1.isNull()); + QVERIFY(verify()); + + // service provider fails to fulfill request + EXPECT(HbLineEdit::text).returns(KValidKeySequence); + EXPECT(XQAiwInterfaceDescriptor::isValid).returns(false); + EXPECT(XQAiwInterfaceDescriptor::isValid).returns(true); + QPointer aiwRequest2(new XQAiwRequest( + dummyDescriptor, dummyOperation, false)); + EXPECT(XQApplicationManager::create).returns(aiwRequest2.data()); + EXPECT(XQAiwRequest::send).returns(true); + filtered = m_eventFilter->eventFilter(m_dialPad, &keyEvent); + QVERIFY(!filtered); + QVERIFY(aiwRequest2.isNull()); + QVERIFY(verify()); +} + #endif int main(int argc, char *argv[]) diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.h --- a/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.h Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.h Wed Jun 23 18:49:32 2010 +0300 @@ -23,6 +23,7 @@ class Dialpad; class DialpadKeySequenceEventFilter; +class HbLineEdit; class UT_DialpadKeySequenceEventFilter : public QObject, public MockService { @@ -42,11 +43,13 @@ void eventFilterNotAKeyEvent(); void eventFilterNotAHashKey(); void eventFilterNotValidKeySequence(); + void eventFilterServiceRequestFails(); #endif private: Dialpad *m_dialPad; DialpadKeySequenceEventFilter *m_eventFilter; + HbLineEdit *m_lineEditMock; }; #endif // UT_DIALPADKEYSEQUENCEEVENTFILTER_H diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.pro --- a/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/ut_dialpadkeysequenceeventfilter.pro Wed Jun 23 18:49:32 2010 +0300 @@ -42,9 +42,15 @@ SOURCES += ut_dialpadkeysequenceeventfilter.cpp HEADERS += ../../../../../phonesrv_plat/dialpad_api/inc/dialpad.h -HEADERS += /epoc32/include/mw/xqservicerequest.h +HEADERS += /epoc32/include/mw/xqservicerequest.h \ + /epoc32/include/mw/xqappmgr.h \ + /epoc32/include/mw/xqaiwrequest.h + SOURCES += ../shared/mock_dialpad.cpp \ ../shared/mock_xqservicerequest.cpp \ - ../shared/mock_hblineedit.cpp + ../shared/mock_hblineedit.cpp \ + ../shared/mock_xqappmgr.cpp \ + ../shared/mock_xqaiwrequest.cpp \ + ../shared/mock_xqaiwinterfacedescriptor.cpp LIBS += -lmocklib -lsymbianmock -lxqserviceutil diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadvideomailboxeventfilter/ut_dialpadvideomailboxeventfilter.cpp --- a/telutils/dialpad/tsrc/unit/ut_dialpadvideomailboxeventfilter/ut_dialpadvideomailboxeventfilter.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadvideomailboxeventfilter/ut_dialpadvideomailboxeventfilter.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -31,6 +31,7 @@ #endif #include "dialpadtest.h" +#include "dialpadtestutil.h" #include "dialpadvideomailboxeventfilter.h" #include "dialpad.h" #include "dialpadsymbianwrapper.h" @@ -83,14 +84,6 @@ { Q_OBJECT -public: - enum MouseEventType - { - Press, - Release, - Click - }; - private slots: void initTestCase(); void init(); @@ -103,16 +96,11 @@ void testNumericKeyTwoShortThenLongPress(); private: - QGraphicsWidget* getWidgetByName(const QString& name); - void mouseClickDialpad(int key, MouseEventType type=Click, - bool pause=true); - -private: HbMainWindow* mMainWindow; Dialpad* mDialpad; DialpadVideoMailboxEventFilter *mEventFilter; KeyEventCatcher* mKeyCatcher; - QMap mKeyNames; + DialpadTestUtil* mUtil; }; void ut_DialpadVideoMailboxEventFilter::initTestCase() @@ -122,6 +110,8 @@ mKeyCatcher = new KeyEventCatcher; mMainWindow->installEventFilter(mKeyCatcher); + mUtil = new DialpadTestUtil(*mMainWindow); + mDialpad = new Dialpad(); mEventFilter = new DialpadVideoMailboxEventFilter(mDialpad, this); hbInstance->allMainWindows().at(0)->installEventFilter(mEventFilter); @@ -133,21 +123,6 @@ mDialpad->setPreferredSize(360,400); mDialpad->setPos(0,100); - mKeyNames.insert(Qt::Key_1,"49"); - mKeyNames.insert(Qt::Key_2,"50"); - mKeyNames.insert(Qt::Key_3,"51"); - mKeyNames.insert(Qt::Key_4,"52"); - mKeyNames.insert(Qt::Key_5,"53"); - mKeyNames.insert(Qt::Key_6,"54"); - mKeyNames.insert(Qt::Key_7,"55"); - mKeyNames.insert(Qt::Key_8,"56"); - mKeyNames.insert(Qt::Key_9,"57"); - mKeyNames.insert(Qt::Key_Asterisk,"42"); - mKeyNames.insert(Qt::Key_0,"48"); - mKeyNames.insert(Qt::Key_NumberSign,"35"); - mKeyNames.insert(Qt::Key_Backspace,"16777219"); - mKeyNames.insert(Qt::Key_Yes,"16842753"); - mMainWindow->show(); mDialpad->show(); mDialpad->hide(); @@ -166,6 +141,7 @@ delete mDialpad; delete mMainWindow; delete mKeyCatcher; + delete mUtil; } void ut_DialpadVideoMailboxEventFilter::cleanup() @@ -176,64 +152,13 @@ QTest::qWait( WAIT_TIME ); // delay between tests } -QGraphicsWidget* ut_DialpadVideoMailboxEventFilter::getWidgetByName(const QString& name) -{ - Q_ASSERT(mMainWindow!=0); - - QGraphicsWidget* widget = 0; - - QList items = mMainWindow->scene()->items(); - foreach (QGraphicsItem* item, items) { - if (item->isWidget()) { - QGraphicsWidget *w = static_cast(item); - if (w->objectName()==name) { - widget = w; - } - } - } - - return widget; -} - -void ut_DialpadVideoMailboxEventFilter::mouseClickDialpad(int key, MouseEventType type, bool pause) -{ - QString name = mKeyNames.value(key); - - QGraphicsWidget* widget = getWidgetByName(name); - - if ( widget ) { - QPointF widgetPos = widget->scenePos() + - widget->rect().center(); - - QPoint windowPos = mMainWindow->mapFromScene( widgetPos ); - - if (type==Press) { - QTest::mousePress( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } else if (type==Release) { - QTest::mouseRelease( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } else { - QTest::mouseClick( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } - - if (pause) { - QTest::qWait( WAIT_TIME ); - } - } else { - QFAIL( "Button could not be accessed!" ); - } -} - - void ut_DialpadVideoMailboxEventFilter::testNumericKeyTwoLongPress() { mDialpad->openDialpad(); QTest::qWait(WAIT_TIME); - mouseClickDialpad(Qt::Key_2, Press); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Press); QTest::qWait(2000); - mouseClickDialpad(Qt::Key_2, Release); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Release); QTest::qWait(1000); QCOMPARE(mDialpad->editor().text(), QString("")); mDialpad->closeDialpad(); @@ -250,9 +175,9 @@ { mDialpad->openDialpad(); QTest::qWait(WAIT_TIME); - mouseClickDialpad(Qt::Key_2, Press); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Press); QTest::qWait(200); - mouseClickDialpad(Qt::Key_2, Release); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Release); QTest::qWait(1000); // Check that character '1' is in editor. QCOMPARE(mDialpad->editor().text(), QString("2")); @@ -263,11 +188,11 @@ // Then one short and one long press mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_2, Press); - mouseClickDialpad(Qt::Key_2, Release); - mouseClickDialpad(Qt::Key_2, Press); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Press); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Release); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Press); QTest::qWait(2000); - mouseClickDialpad(Qt::Key_2, Release); + mUtil->mouseClickDialpad(Qt::Key_2, DialpadTestUtil::Release); QTest::qWait(1000); QVERIFY(mDialpad->editor().text()=="22"); mDialpad->closeDialpad(); diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadvideomailboxeventfilter/ut_dialpadvideomailboxeventfilter.pro --- a/telutils/dialpad/tsrc/unit/ut_dialpadvideomailboxeventfilter/ut_dialpadvideomailboxeventfilter.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadvideomailboxeventfilter/ut_dialpadvideomailboxeventfilter.pro Wed Jun 23 18:49:32 2010 +0300 @@ -30,13 +30,15 @@ } # -HEADERS += ../../../inc/dialpadvideomailboxeventfilter.h -HEADERS += ../../../inc/dialpadmailboxeventfilterbase.h -HEADERS += ../../../inc/dialpadsymbianwrapper.h -HEADERS += xqservicerequest.h -SOURCES += ut_dialpadvideomailboxeventfilter.cpp -SOURCES += ../../../src/dialpadvideomailboxeventfilter.cpp -SOURCES += ../../../src/dialpadmailboxeventfilterbase.cpp +HEADERS += ../../../inc/dialpadvideomailboxeventfilter.h \ + ../../../inc/dialpadmailboxeventfilterbase.h \ + ../../../inc/dialpadsymbianwrapper.h \ + xqservicerequest.h \ + dialpadtestutil.h +SOURCES += ut_dialpadvideomailboxeventfilter.cpp \ + ../../../src/dialpadvideomailboxeventfilter.cpp \ + ../../../src/dialpadmailboxeventfilterbase.cpp \ + ../shared/dialpadtestutil.cpp # LIBS += -ldialpad diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.cpp --- a/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -31,6 +31,7 @@ #endif #include "dialpadtest.h" +#include "dialpadtestutil.h" #include "dialpadvoicemailboxeventfilter.h" #include "dialpad.h" #include "dialpadsymbianwrapper.h" @@ -83,14 +84,6 @@ { Q_OBJECT -public: - enum MouseEventType - { - Press, - Release, - Click - }; - private slots: void initTestCase(); void init(); @@ -103,16 +96,11 @@ void testNumericKeyOneShortThenLongPress(); private: - QGraphicsWidget* getWidgetByName(const QString& name); - void mouseClickDialpad(int key, MouseEventType type=Click, - bool pause=true); - -private: HbMainWindow* mMainWindow; Dialpad* mDialpad; DialpadVoiceMailboxEventFilter *mEventFilter; KeyEventCatcher* mKeyCatcher; - QMap mKeyNames; + DialpadTestUtil* mUtil; }; void ut_DialpadVoiceMailboxEventFilter::initTestCase() @@ -122,6 +110,8 @@ mKeyCatcher = new KeyEventCatcher; mMainWindow->installEventFilter(mKeyCatcher); + mUtil = new DialpadTestUtil(*mMainWindow); + mDialpad = new Dialpad(); mEventFilter = new DialpadVoiceMailboxEventFilter(mDialpad, this); hbInstance->allMainWindows().at(0)->installEventFilter(mEventFilter); @@ -133,21 +123,6 @@ mDialpad->setPreferredSize(360,400); mDialpad->setPos(0,100); - mKeyNames.insert(Qt::Key_1,"49"); - mKeyNames.insert(Qt::Key_2,"50"); - mKeyNames.insert(Qt::Key_3,"51"); - mKeyNames.insert(Qt::Key_4,"52"); - mKeyNames.insert(Qt::Key_5,"53"); - mKeyNames.insert(Qt::Key_6,"54"); - mKeyNames.insert(Qt::Key_7,"55"); - mKeyNames.insert(Qt::Key_8,"56"); - mKeyNames.insert(Qt::Key_9,"57"); - mKeyNames.insert(Qt::Key_Asterisk,"42"); - mKeyNames.insert(Qt::Key_0,"48"); - mKeyNames.insert(Qt::Key_NumberSign,"35"); - mKeyNames.insert(Qt::Key_Backspace,"16777219"); - mKeyNames.insert(Qt::Key_Yes,"16842753"); - mMainWindow->show(); mDialpad->show(); mDialpad->hide(); @@ -166,6 +141,7 @@ delete mDialpad; delete mMainWindow; delete mKeyCatcher; + delete mUtil; } void ut_DialpadVoiceMailboxEventFilter::cleanup() @@ -176,64 +152,13 @@ QTest::qWait( WAIT_TIME ); // delay between tests } -QGraphicsWidget* ut_DialpadVoiceMailboxEventFilter::getWidgetByName(const QString& name) -{ - Q_ASSERT(mMainWindow!=0); - - QGraphicsWidget* widget = 0; - - QList items = mMainWindow->scene()->items(); - foreach (QGraphicsItem* item, items) { - if (item->isWidget()) { - QGraphicsWidget *w = static_cast(item); - if (w->objectName()==name) { - widget = w; - } - } - } - - return widget; -} - -void ut_DialpadVoiceMailboxEventFilter::mouseClickDialpad(int key, MouseEventType type, bool pause) -{ - QString name = mKeyNames.value(key); - - QGraphicsWidget* widget = getWidgetByName(name); - - if ( widget ) { - QPointF widgetPos = widget->scenePos() + - widget->rect().center(); - - QPoint windowPos = mMainWindow->mapFromScene( widgetPos ); - - if (type==Press) { - QTest::mousePress( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } else if (type==Release) { - QTest::mouseRelease( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } else { - QTest::mouseClick( mMainWindow->viewport(), Qt::LeftButton, - 0, windowPos ); - } - - if (pause) { - QTest::qWait( WAIT_TIME ); - } - } else { - QFAIL( "Button could not be accessed!" ); - } -} - - void ut_DialpadVoiceMailboxEventFilter::testNumericKeyOneLongPress() { mDialpad->openDialpad(); QTest::qWait(WAIT_TIME); - mouseClickDialpad(Qt::Key_1, Press); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press); QTest::qWait(2000); - mouseClickDialpad(Qt::Key_1, Release); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release); QTest::qWait(1000); QCOMPARE(mDialpad->editor().text(), QString("")); mDialpad->closeDialpad(); @@ -250,9 +175,9 @@ { mDialpad->openDialpad(); QTest::qWait(WAIT_TIME); - mouseClickDialpad(Qt::Key_1, Press); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press); QTest::qWait(200); - mouseClickDialpad(Qt::Key_1, Release); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release); QTest::qWait(1000); // Check that character '1' is in editor. QCOMPARE(mDialpad->editor().text(), QString("1")); @@ -263,11 +188,11 @@ // Then one short and one long press mDialpad->openDialpad(); QTest::qWait( WAIT_TIME ); - mouseClickDialpad(Qt::Key_1, Press); - mouseClickDialpad(Qt::Key_1, Release); - mouseClickDialpad(Qt::Key_1, Press); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press); QTest::qWait(2000); - mouseClickDialpad(Qt::Key_1, Release); + mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release); QTest::qWait(1000); QVERIFY(mDialpad->editor().text()=="11"); mDialpad->closeDialpad(); diff -r 7eb70891911c -r a2467631ae02 telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.pro --- a/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.pro Wed Jun 23 18:49:32 2010 +0300 @@ -30,13 +30,15 @@ } # -HEADERS += ../../../inc/dialpadvoicemailboxeventfilter.h -HEADERS += ../../../inc/dialpadmailboxeventfilterbase.h -HEADERS += ../../../inc/dialpadsymbianwrapper.h -HEADERS += xqservicerequest.h -SOURCES += ut_dialpadvoicemailboxeventfilter.cpp -SOURCES += ../../../src/dialpadvoicemailboxeventfilter.cpp -SOURCES += ../../../src/dialpadmailboxeventfilterbase.cpp +HEADERS += ../../../inc/dialpadvoicemailboxeventfilter.h \ + ../../../inc/dialpadmailboxeventfilterbase.h \ + ../../../inc/dialpadsymbianwrapper.h \ + xqservicerequest.h \ + dialpadtestutil.h +SOURCES += ut_dialpadvoicemailboxeventfilter.cpp \ + ../../../src/dialpadvoicemailboxeventfilter.cpp \ + ../../../src/dialpadmailboxeventfilterbase.cpp \ + ../shared/dialpadtestutil.cpp # LIBS += -ldialpad diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/inc/keysequencerecognitionservicedefs.h --- a/telutils/keysequencerecognitionservice/inc/keysequencerecognitionservicedefs.h Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/keysequencerecognitionservice/inc/keysequencerecognitionservicedefs.h Wed Jun 23 18:49:32 2010 +0300 @@ -35,5 +35,14 @@ const QString KCodeImei("*#06#"); /*! code for showing life timer data */ const QString KCodeLifeTimer("*#92702689#"); +/*! code for changing pin code 1 */ +const QString KCodeChangePin1("\\*\\*04\\*.*"); +/*! code for changing pin code 2 */ +const QString KCodeChangePin2("\\*\\*042.*"); +/*! code for unblocking pin code 1 */ +const QString KCodeUnblockPin1("\\*\\*05\\*.*"); +/*! code for unblocking pin code 2 */ +const QString KCodeUnblockPin2("\\*\\*052.*"); + #endif // KEYSEQUENCERECOGNITIONSERVICEDEFS_H diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/inc/simcontrolkeysequencehandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/inc/simcontrolkeysequencehandler.h Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,54 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implements simcontrol key sequence handling. +* +*/ + +#ifndef SIMCONTROLKEYSEQUENCEHANDLER_H +#define SIMCONTROLKEYSEQUENCEHANDLER_H + +#include "keysequencehandler.h" + +class CManualSecuritySettings; + +class SimControlKeySequenceHandler : public KeySequenceHandler +{ + Q_OBJECT + +public: + + SimControlKeySequenceHandler(QObject *parent = 0); + ~SimControlKeySequenceHandler(); + + bool executeKeySequence(const QString &keySequence); + + enum SimOperation + { + Pin1, + Pin2, + Unblock1, + Unblock2 + }; + +private: + + bool parseString( const QString &keySequence ); + void processChangePin(SimOperation op, QString oldPin, QString newPin, QString verifyNew); + void processUnblockPin(SimOperation op, QString puk, QString newPin, QString verifyNew); + +private: + CManualSecuritySettings* m_securityModel; +}; + +#endif // SIMCONTROLKEYSEQUENCEHANDLER_H diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/keysequencerecognitionservice.pri --- a/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pri Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pri Wed Jun 23 18:49:32 2010 +0300 @@ -13,6 +13,7 @@ ./inc/keysequencehandler.h \ ./inc/manufacturerkeysequencehandler.h \ ./inc/imeikeysequencehandler.h \ + ./inc/simcontrolkeysequencehandler.h \ ./inc/lifetimerkeysequencehandler.h SOURCES = ./src/main.cpp \ @@ -20,4 +21,5 @@ ./src/keysequencehandler.cpp \ ./src/manufacturerkeysequencehandler.cpp \ ./src/imeikeysequencehandler.cpp \ + ./src/simcontrolkeysequencehandler.cpp \ ./src/lifetimerkeysequencehandler.cpp diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/keysequencerecognitionservice.pro --- a/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pro Wed Jun 23 18:49:32 2010 +0300 @@ -49,5 +49,5 @@ LIBS += -lxqservice -lxqserviceutil -lxqutils \ -letel -letelmm -lcustomapi \ - -lcentralrepository -lQtSystemInfo + -lcentralrepository -lQtSystemInfo -lsecui } diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice.iby --- a/telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice.iby Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice.iby Wed Jun 23 18:49:32 2010 +0300 @@ -21,7 +21,7 @@ #include #include -file = ABI_DIR/BUILD_DIR/keysequencerecognitionservice.exe +file = ABI_DIR/BUILD_DIR/keysequencerecognitionservice.exe \ PROGRAMS_DIR/keysequencerecognitionservice.exe data = DATAZ_/private/10003a3f/import/apps/keysequencerecognitionservice_reg.rsc \ private/10003a3f/import/apps/keysequencerecognitionservice_reg.rsc diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/src/keysequencerecognitionprovider.cpp --- a/telutils/keysequencerecognitionservice/src/keysequencerecognitionprovider.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/keysequencerecognitionservice/src/keysequencerecognitionprovider.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -23,6 +23,7 @@ #include "manufacturerkeysequencehandler.h" #include "imeikeysequencehandler.h" #include "lifetimerkeysequencehandler.h" +#include "simcontrolkeysequencehandler.h" #include "keysequencerecognitionservicelog.h" /*! @@ -134,6 +135,11 @@ new LifeTimerKeySequenceHandler(this)); m_handlers.append(lifeTimerHandler.data()); lifeTimerHandler.take(); + + QScopedPointer simControlHandler( + new SimControlKeySequenceHandler(this)); + m_handlers.append(simControlHandler.data()); + simControlHandler.take(); } diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/src/simcontrolkeysequencehandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/src/simcontrolkeysequencehandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,195 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implements simcontrol key sequence handling. +* +*/ + +#include +#include +#include +#include +#include "keysequencerecognitionservicedefs.h" +#include "keysequencerecognitionservicelog.h" +#include "simcontrolkeysequencehandler.h" + + +//QTM_USE_NAMESPACE + +/*! + SimControlKeySequenceHandler::SimControlKeySequenceHandler. + */ +SimControlKeySequenceHandler::SimControlKeySequenceHandler( + QObject* parent) + : + KeySequenceHandler(parent), + m_securityModel(0) +{ + DPRINT_METHODENTRYEXIT; + + setKeySequenceValidator(KCodeChangePin1 + "|" + + KCodeChangePin2 + "|" + + KCodeUnblockPin1 + "|" + + KCodeUnblockPin2); + + QT_TRAP_THROWING(TSecUi::InitializeLibL()); + QT_TRAP_THROWING( m_securityModel = CManualSecuritySettings::NewL() ); +} + + +/*! + SimControlKeySequenceHandler::~SimControlKeySequenceHandler. + */ +SimControlKeySequenceHandler::~SimControlKeySequenceHandler() +{ + DPRINT_METHODENTRYEXIT; + + delete m_securityModel; + TSecUi::UnInitializeLib(); +} + + +/*! + SimControlKeySequenceHandler::executeKeySequence. + */ +bool SimControlKeySequenceHandler::executeKeySequence( + const QString &keySequence) +{ + DPRINT_METHODENTRYEXIT; + + bool handled = parseString( keySequence ); + + return handled; +} + + + +bool SimControlKeySequenceHandler::parseString(const QString &keySequence) +{ + DPRINT_METHODENTRYEXIT; + + const QString KChangePin1("**04*"); + const QString KChangePin2("**042"); + const QString KUnblockPin1("**05*"); + const QString KUnblockPin2("**052"); + + QString oldPin; + QString newPin; + QString verifyNewPin; + QString puk; + + SimOperation operation; + bool handled = false; + + QString keySequencePrefix (keySequence); + + //Get first 5 chars from keysequence string + keySequencePrefix.chop(keySequencePrefix.length()-5); + QRegExp expression(QRegExp::escape(keySequencePrefix)); + + QString parsedKeySequence(keySequence); + + //remove '#' from end + parsedKeySequence.chop(1); + + QStringList pins; + + if (expression.exactMatch(KChangePin1) || expression.exactMatch(KChangePin2)) + { + if (expression.exactMatch(KChangePin1)) + { + parsedKeySequence.remove(0, 5); + operation = Pin1; + } + + if (expression.exactMatch(KChangePin2)) + { + parsedKeySequence.remove(0, 6); + operation = Pin2; + } + pins = parsedKeySequence.split("*"); + oldPin= pins.value(0); + newPin = pins.value(1); + verifyNewPin = pins.value(2); + handled = true; + processChangePin(operation, oldPin, newPin, verifyNewPin); + } + + if (expression.exactMatch(KUnblockPin1) || expression.exactMatch(KUnblockPin2)) + { + if ( expression.exactMatch(KUnblockPin1)) + { + parsedKeySequence.remove(0, 5); + operation = Pin1; + } + + if (expression.exactMatch(KUnblockPin2)) + { + parsedKeySequence.remove(0, 6); + operation = Pin2; + } + + pins = parsedKeySequence.split("*"); + puk = pins.value(0); + newPin = pins.value(1); + verifyNewPin = pins.value(2); + handled = true; + processUnblockPin(operation, puk, newPin, verifyNewPin); + } + + return handled; +} + +void SimControlKeySequenceHandler::processChangePin(SimOperation operation, QString oldPin, + QString newPin, QString verifyNew) + { + CManualSecuritySettings::TPin pin; + + if(operation == Pin1) + { + pin = CManualSecuritySettings::EPin1; + } + else + { + pin = CManualSecuritySettings::EPin2; + } + + TBuf<200> oldPinBuf(oldPin.utf16()); + TBuf<200> newPinBuf(newPin.utf16()); + TBuf<200> verifyNewBuf(verifyNew.utf16()); + + QT_TRAP_THROWING(m_securityModel->ChangePinL(pin, oldPinBuf, newPinBuf, verifyNewBuf)); + } + + +void SimControlKeySequenceHandler::processUnblockPin(SimOperation operation, QString puk, QString newPin, + QString verifyNew) + { + CManualSecuritySettings::TPin pin; + + if(operation == Pin1) + { + pin = CManualSecuritySettings::EPin1; + } + else + { + pin= CManualSecuritySettings::EPin2; + } + + TBuf<200> pukBuf(puk.utf16()); + TBuf<200> newPinBuf(newPin.utf16()); + TBuf<200> verifyNewBuf(verifyNew.utf16()); + + + QT_TRAP_THROWING(m_securityModel->UnblockPinL(pin, pukBuf, newPinBuf, verifyNewBuf)); + } diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/tsrc/shared/mock_etelmm.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/tsrc/shared/mock_etelmm.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,76 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include +#include "etelmm.h" + +// ============================ MEMBER FUNCTIONS =============================== + + + +// ----------------------------------------------------------------------------- +// RMobilePhone::GetMultimodeCaps +// ----------------------------------------------------------------------------- +// +TInt RMobilePhone::GetMultimodeCaps( + TUint32 & aCaps ) const + { + SMC_MOCK_METHOD1( TInt, TUint32 &, aCaps ) + } + + +// ----------------------------------------------------------------------------- +// RMobilePhone::GetCurrentMode +// ----------------------------------------------------------------------------- +// +TInt RMobilePhone::GetCurrentMode( + TMobilePhoneNetworkMode & aNetworkMode ) const + { + SMC_MOCK_METHOD1( TInt, TMobilePhoneNetworkMode &, aNetworkMode ) + } + + +// ----------------------------------------------------------------------------- +// RMobilePhone::GetSignalStrength +// ----------------------------------------------------------------------------- +// +void RMobilePhone::GetSignalStrength( + TRequestStatus & aReqStatus, + TInt32 & aSignalStrength, + TInt8 & aBar ) const + { + SMC_MOCK_METHOD3( void, TRequestStatus &, aReqStatus, + TInt32 &, aSignalStrength, + TInt8 &, aBar ) + } + + +// ----------------------------------------------------------------------------- +// RMobilePhone::NotifySignalStrengthChange +// ----------------------------------------------------------------------------- +// +void RMobilePhone::NotifySignalStrengthChange( + TRequestStatus & aReqStatus, + TInt32 & aSignalStrength, + TInt8 & aBar ) const + { + SMC_MOCK_METHOD3( void, TRequestStatus &, aReqStatus, + TInt32 &, aSignalStrength, + TInt8 &, aBar ) + } + + diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/tsrc/shared/mock_secui.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/tsrc/shared/mock_secui.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,106 @@ +/* +* 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 + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// TSecUi::TSecUi +// ----------------------------------------------------------------------------- +// +TSecUi::TSecUi( ) + { + + } + + +// ----------------------------------------------------------------------------- +// TSecUi::ConstructL +// ----------------------------------------------------------------------------- +// +void TSecUi::ConstructL( ) + { + + } + + +// ----------------------------------------------------------------------------- +// TSecUi::InitializeLibL +// ----------------------------------------------------------------------------- +// +void TSecUi::InitializeLibL( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// TSecUi::UnInitializeLib +// ----------------------------------------------------------------------------- +// +void TSecUi::UnInitializeLib( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// TSecUi::ResourceFileName +// ----------------------------------------------------------------------------- +// +TFileName TSecUi::ResourceFileName( ) + { + SMC_MOCK_METHOD0( TFileName ) + } + + +// ----------------------------------------------------------------------------- +// TSecUi::CanBeFreed +// ----------------------------------------------------------------------------- +// +TBool TSecUi::CanBeFreed( ) + { + SMC_MOCK_METHOD0( TBool ) + } + + +// ----------------------------------------------------------------------------- +// TSecUi::IncreaseClientCount +// ----------------------------------------------------------------------------- +// +void TSecUi::IncreaseClientCount( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// TSecUi::DecreaseClientCount +// ----------------------------------------------------------------------------- +// +void TSecUi::DecreaseClientCount( ) + { + SMC_MOCK_METHOD0( void ) + } + + diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/tsrc/shared/mock_secuimanualsecuritysettings.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/tsrc/shared/mock_secuimanualsecuritysettings.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,183 @@ +/* +* 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 "secuimanualsecuritysettings.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::CManualSecuritySettings +// ----------------------------------------------------------------------------- +// +CManualSecuritySettings::CManualSecuritySettings( ) + //: + //CBase( /**/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::ConstructL +// ----------------------------------------------------------------------------- +// +void CManualSecuritySettings::ConstructL( ) + { + + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::NewL +// ----------------------------------------------------------------------------- +// +CManualSecuritySettings * CManualSecuritySettings::NewL( ) + { + SMC_MOCK_NEWL0( CManualSecuritySettings * ) + + CManualSecuritySettings* self = new( ELeave ) CManualSecuritySettings; + CleanupStack::PushL( self ); + //self->ConstructL() + CleanupStack::Pop( self ); + return self; + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::~CManualSecuritySettings +// ----------------------------------------------------------------------------- +// +CManualSecuritySettings::~CManualSecuritySettings( ) + { + + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::ChangePinL +// ----------------------------------------------------------------------------- +// +TBool CManualSecuritySettings::ChangePinL( + TPin aPin, + const TDesC & aOld, + const TDesC & aNew, + const TDesC & aVerifyNew ) + { + SMC_MOCK_METHOD4( TBool, TPin, aPin, + const TDesC &, aOld, + const TDesC &, aNew, + const TDesC &, aVerifyNew ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::CancelChangePin +// ----------------------------------------------------------------------------- +// +void CManualSecuritySettings::CancelChangePin( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::UnblockPinL +// ----------------------------------------------------------------------------- +// +TBool CManualSecuritySettings::UnblockPinL( + TPin aPin, + const TDesC & aPuk, + const TDesC & aNew, + const TDesC & aVerifyNew ) + { + SMC_MOCK_METHOD4( TBool, TPin, aPin, + const TDesC &, aPuk, + const TDesC &, aNew, + const TDesC &, aVerifyNew ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::CancelUnblockPin +// ----------------------------------------------------------------------------- +// +void CManualSecuritySettings::CancelUnblockPin( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::LockSimL +// ----------------------------------------------------------------------------- +// +TBool CManualSecuritySettings::LockSimL( + const TDesC & aLockCode, + const TDesC & aType ) + { + SMC_MOCK_METHOD2( TBool, const TDesC &, aLockCode, + const TDesC &, aType ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::CancelLockSim +// ----------------------------------------------------------------------------- +// +void CManualSecuritySettings::CancelLockSim( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::UnlockSimL +// ----------------------------------------------------------------------------- +// +TBool CManualSecuritySettings::UnlockSimL( + const TDesC & aUnlockCode, + const TDesC & aType ) + { + SMC_MOCK_METHOD2( TBool, const TDesC &, aUnlockCode, + const TDesC &, aType ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::CancelUnlockSim +// ----------------------------------------------------------------------------- +// +void CManualSecuritySettings::CancelUnlockSim( ) + { + SMC_MOCK_METHOD0( void ) + } + + +// ----------------------------------------------------------------------------- +// CManualSecuritySettings::ShowResultNoteL +// ----------------------------------------------------------------------------- +// +void CManualSecuritySettings::ShowResultNoteL( + CAknNoteDialog::TTone aTone, + TInt aResourceID ) + { + SMC_MOCK_METHOD2( void, CAknNoteDialog::TTone, aTone, + TInt, aResourceID ) + } + + diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/tsrc/ut_simcontrolkeysecuencehandler/ut_simcontrolkeysecuencehandler.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/tsrc/ut_simcontrolkeysecuencehandler/ut_simcontrolkeysecuencehandler.pro Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,59 @@ +# +# 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: +# +# + +MOC_DIR = moc +CONFIG += hb qtestlib + + +TEMPLATE = app +TARGET = ut_simcontrolkeysecuencehandler + +QT += core +QT -= gui + + +SOURCES += ut_simcontrolkeysecuencehandler_reg.rss + + + + +symbian { + INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE + INCLUDEPATH += . ../shared ../../inc + HEADERS += ../../inc/simcontrolkeysequencehandler.h + SOURCES += ../../src/simcontrolkeysequencehandler.cpp + + HEADERS += ut_simcontrolkeysequencehandler.h + SOURCES += ut_simcontrolkeysequencehandler.cpp + + #MOCKED DEPENDENCIES + HEADERS += \ + ../../inc/keysequencehandler.h + + SOURCES += \ + ../shared/mock_keysequencehandler.cpp \ + ../shared/mock_secuimanualsecuritysettings.cpp \ + ../shared/mock_secui.cpp \ + ../shared/mock_etel.cpp \ + ../shared/mock_rmmcustomapi.cpp \ + ../shared/mock_etelmm.cpp + + + LIBS += -lmocklib -lsymbianmock + LIBS += -letel -letelmm -lcustomapi + TARGET.UID3 = 0xED019EF7 +} \ No newline at end of file diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/tsrc/ut_simcontrolkeysecuencehandler/ut_simcontrolkeysequencehandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/tsrc/ut_simcontrolkeysecuencehandler/ut_simcontrolkeysequencehandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,190 @@ +/*! +* 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 "UT_SimControlKeySequenceHandler.h" +#include "simcontrolkeysequencehandler.h" +#include "keysequencerecognitionservicedefs.h" +#include "qtestmains60.h" + +_LIT(KOldPinCode, "1234"); +_LIT(KPukCode, "11111111"); +_LIT(KNewPinCode, "4321"); +_LIT(KVerifyNewPinCode, "4321"); + + +void generateLeaveL() +{ + User::Leave(KErrUnknown); +} + + +UT_SimControlKeySequenceHandler::UT_SimControlKeySequenceHandler() + : + m_handler(0) +{ + +} + + +UT_SimControlKeySequenceHandler::~UT_SimControlKeySequenceHandler() +{ + delete m_handler; +} + + +void UT_SimControlKeySequenceHandler::init() +{ + initialize(); + + m_handler = new SimControlKeySequenceHandler(); +} + + +void UT_SimControlKeySequenceHandler::cleanup() +{ + reset(); + + delete m_handler; + m_handler = 0; +} + +void UT_SimControlKeySequenceHandler::t_constructionFails() +{ + EXPECT( CManualSecuritySettings::NewL() ).willOnce(invokeWithoutArguments(generateLeaveL)); + + int result = 0; + QT_TRYCATCH_ERROR(result, + QScopedPointer handler( + new SimControlKeySequenceHandler()) + ) + QVERIFY(0 != result); +} + + +void UT_SimControlKeySequenceHandler::t_changePin1() + { + const QString KChangePin1KeySequence( "**04*1234*4321*4321*" ); + + EXPECT(CManualSecuritySettings::ChangePinL) + .with(CManualSecuritySettings::EPin1, KOldPinCode(), KNewPinCode(), KVerifyNewPinCode()); + + m_handler->executeKeySequence( KChangePin1KeySequence ); + + QVERIFY(verify()); + + + // leave handling + EXPECT( CManualSecuritySettings::ChangePinL ).willOnce(invokeWithoutArguments(generateLeaveL)) + .with(CManualSecuritySettings::EPin1, KOldPinCode(), KNewPinCode(), KVerifyNewPinCode()); + int result = 0; + QT_TRYCATCH_ERROR(result, + m_handler->executeKeySequence(KChangePin1KeySequence) ) + + QVERIFY(0 != result); + } + +void UT_SimControlKeySequenceHandler::t_changePin2() + { + const QString KChangePin2KeySequence( "**042*1234*4321*4321*" ); + + EXPECT(CManualSecuritySettings::ChangePinL) + .with(CManualSecuritySettings::EPin2, KOldPinCode(), KNewPinCode(), KVerifyNewPinCode()); + + m_handler->executeKeySequence(KChangePin2KeySequence); + + QVERIFY(verify()); + + + //leave handling + EXPECT( CManualSecuritySettings::ChangePinL ).willOnce(invokeWithoutArguments(generateLeaveL)) + .with(CManualSecuritySettings::EPin2, KOldPinCode(), KNewPinCode(), KVerifyNewPinCode()); + + int result = 0; + QT_TRYCATCH_ERROR(result, + m_handler->executeKeySequence(KChangePin2KeySequence) ) + + QVERIFY(0 != result); + } + +void UT_SimControlKeySequenceHandler::t_unblockPin1() + { + const QString KUnblockPin1KeySequence( "**05*11111111*4321*4321*" ); + + EXPECT(CManualSecuritySettings::UnblockPinL) + .with(CManualSecuritySettings::EPin1, KPukCode(), KNewPinCode(), KVerifyNewPinCode()); + + m_handler->executeKeySequence(KUnblockPin1KeySequence); + + QVERIFY(verify()); + + + //leave handling + EXPECT( CManualSecuritySettings::UnblockPinL ).willOnce(invokeWithoutArguments(generateLeaveL)) + .with(CManualSecuritySettings::EPin1, KPukCode(), KNewPinCode(), KVerifyNewPinCode()); + + int result = 0; + QT_TRYCATCH_ERROR(result, + m_handler->executeKeySequence(KUnblockPin1KeySequence) ) + + QVERIFY(0 != result); + } + + +void UT_SimControlKeySequenceHandler::t_unblockPin2() + { + const QString KUnblockPin2KeySequence( "**052*11111111*4321*4321*" ); + + EXPECT(CManualSecuritySettings::UnblockPinL) + .with(CManualSecuritySettings::EPin2, KPukCode(), KNewPinCode(), KVerifyNewPinCode()); + + m_handler->executeKeySequence(KUnblockPin2KeySequence); + + QVERIFY(verify()); + + + //leave handling + EXPECT( CManualSecuritySettings::UnblockPinL ).willOnce(invokeWithoutArguments(generateLeaveL)) + .with(CManualSecuritySettings::EPin2, KPukCode(), KNewPinCode(), KVerifyNewPinCode()); + + int result = 0; + QT_TRYCATCH_ERROR(result, + m_handler->executeKeySequence(KUnblockPin2KeySequence) ) + + QVERIFY(0 != result); + } + + +void UT_SimControlKeySequenceHandler::t_keySequenceValidator() + { + QString expectedValidator = + QRegExp::escape(KCodeChangePin1) + "|" + + QRegExp::escape(KCodeChangePin2) + "|" + + QRegExp::escape(KCodeUnblockPin1) + "|" + + QRegExp::escape(KCodeUnblockPin2); + + expect("KeySequenceHandler::setKeySequenceValidator") + .with(expectedValidator); + + QScopedPointer handler( + new SimControlKeySequenceHandler()); + + QVERIFY(verify()); + } + +QTEST_MAIN_S60(UT_SimControlKeySequenceHandler) diff -r 7eb70891911c -r a2467631ae02 telutils/keysequencerecognitionservice/tsrc/ut_simcontrolkeysecuencehandler/ut_simcontrolkeysequencehandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/tsrc/ut_simcontrolkeysecuencehandler/ut_simcontrolkeysequencehandler.h Wed Jun 23 18:49:32 2010 +0300 @@ -0,0 +1,51 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef UT_SIMCONTROLKEYSEQUENCEHANDLER_H +#define UT_SIMCONTROLKEYSEQUENCEHANDLER_H + +#include +#include + +class SimControlKeySequenceHandler; + +class UT_SimControlKeySequenceHandler : public QObject, public MockService +{ + Q_OBJECT + +public: + + UT_SimControlKeySequenceHandler(); + ~UT_SimControlKeySequenceHandler(); + +private slots: + + void init(); + void cleanup(); + void t_constructionFails(); + void t_changePin1(); + void t_changePin2(); + void t_unblockPin1(); + void t_unblockPin2(); + void t_keySequenceValidator(); + + +private: + SimControlKeySequenceHandler *m_handler; +}; + +#endif // UT_SIMCONTROLKEYSEQUENCEHANDLER_H diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/group/phoneparser.mmp --- a/telutils/phoneparser/group/phoneparser.mmp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/phoneparser/group/phoneparser.mmp Wed Jun 23 18:49:32 2010 +0300 @@ -51,7 +51,6 @@ SOURCE cphoneparserfeatures.cpp SOURCE cphonevoipnumberparser.cpp SOURCE cphonevoipnumberhandler.cpp -SOURCE cphonegsmimeiparser.cpp USERINCLUDE ../inc diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/inc/CPhoneGsmImeiParser.h --- a/telutils/phoneparser/inc/CPhoneGsmImeiParser.h Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/* -* Copyright (c) 2008-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: It is parser for Imei string. -* -*/ - - -#ifndef CPHONEGSMIMEIPARSER_H_ -#define CPHONEGSMIMEIPARSER_H_ - -// INCLUDES -#include "cphonegsmparserbase.h" - -// CONSTANTS - - -// CLASS DECLARATION - -/** -* It is parser for IMEI string. -* -* @since 1.0 -* @lib phoneparser.lib -*/ -NONSHARABLE_CLASS( CPhoneGsmImeiParser ) - : public CPhoneGsmParserBase - { - public: // Constructors and destructor - - /** - * Two-phased constructor. - */ - static CPhoneGsmImeiParser* NewLC(); - - public: // Functions from base classes - - /** - * From CPhoneGsmParserBase, parses string. - * - * @param aString string to be parsed. - * @param aResult It will contain result. - * @param aOptions It contains all options related to parsing. - * @return It returns boolean value indicating success of parsing. - */ - TBool ParseL( - const TDesC& aString, - CPhoneGsmParserResult& aResult, - CPhoneGsmOptionContainerBase& aOptions ); - - private: - - /** - * C++ default constructor. - */ - CPhoneGsmImeiParser(); - - }; - -#endif /*CPHONEGSMIMEIPARSER_H_*/ - -// End of File diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/inc/CPhoneGsmParser.h --- a/telutils/phoneparser/inc/CPhoneGsmParser.h Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/phoneparser/inc/CPhoneGsmParser.h Wed Jun 23 18:49:32 2010 +0300 @@ -52,8 +52,7 @@ CPhoneGsmParserBase* aPhoneNumber, CPhoneGsmParserBase* aManufacturerSpecific, CPhoneGsmParserBase* aEmergencyNumberParser, - CPhoneGsmParserBase* iVoipNumber, - CPhoneGsmParserBase* iImeiParser ); + CPhoneGsmParserBase* iVoipNumber); /** * Destructor. @@ -86,8 +85,7 @@ CPhoneGsmParserBase* aPhoneNumber, CPhoneGsmParserBase* aManufacturerSpecific, CPhoneGsmParserBase* aEmergencyNumberParser, - CPhoneGsmParserBase* iVoipNumber, - CPhoneGsmParserBase* iImeiParser ); + CPhoneGsmParserBase* iVoipNumber); /** * By default Symbian OS constructor is private. @@ -129,10 +127,6 @@ // Owned voip number parser. CPhoneGsmParserBase* iVoipNumber; - - // Owned IMEI parser. - CPhoneGsmParserBase* iImeiParser; - }; #endif // CPHONEGSMPARSER_H diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/inc/CPhoneParserFeatures.h --- a/telutils/phoneparser/inc/CPhoneParserFeatures.h Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/phoneparser/inc/CPhoneParserFeatures.h Wed Jun 23 18:49:32 2010 +0300 @@ -64,13 +64,6 @@ public: // New functions /** - * Checks if life timer is enabled. - * - * @return ETrue if supported. - */ - static TBool LifeTimerEnabled(); - - /** * Checks if two digit calling is enabled. * * @return ETrue if supported. diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/src/CPhoneGsmImeiParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmImeiParser.cpp Fri Jun 11 14:07:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +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: Parser for IMEI. -* -*/ - - -// INCLUDE FILES -#include "cphonegsmimeiparser.h" -#include "cphonegsmparserresult.h" -#include "cphonegsmoptioncontainer.h" - -// CONSTANTS - -// IMEI code -_LIT( KPhoneImeiCode, "*#06#" ); - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CPhoneGsmImeiParser::CPhoneGsmImeiParser -// ----------------------------------------------------------------------------- -// -CPhoneGsmImeiParser::CPhoneGsmImeiParser() - { - } - -// ----------------------------------------------------------------------------- -// CPhoneGsmImeiParser::NewLC -// ----------------------------------------------------------------------------- -// -CPhoneGsmImeiParser* CPhoneGsmImeiParser::NewLC() - { - CPhoneGsmImeiParser* self = - new ( ELeave ) CPhoneGsmImeiParser; - - CleanupStack::PushL( self ); - - return self; - } - -// ----------------------------------------------------------------------------- -// CPhoneGsmImeiParser::ParseL -// -// Parse IMEI string. -// ----------------------------------------------------------------------------- -// -TBool CPhoneGsmImeiParser::ParseL( - const TDesC& aString, - CPhoneGsmParserResult& aResult, - CPhoneGsmOptionContainerBase& aOptions ) - { - aResult.ClearL(); - - if ( !aOptions.FindOptionStatus( KPhoneOptionSend )) - { - if ( aString == KPhoneImeiCode ) - { - aResult.SetUid( KPhoneUidIMEI ); - } - } - - return ( aResult.Uid() == KPhoneUidIMEI ); - } - -// End of File diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/src/CPhoneGsmMiscHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmMiscHandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/phoneparser/src/CPhoneGsmMiscHandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Implementation of handlers for USSD and IMEI. +* Description: Implementation of handler for USSD. * */ @@ -42,10 +42,6 @@ } break; - case KPhoneUidIMEI: - ProcessShowIMEIL(); - break; - default: break; } diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/src/CPhoneGsmParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmParser.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/phoneparser/src/CPhoneGsmParser.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -43,8 +43,7 @@ CPhoneGsmParserBase* aPhoneNumber, CPhoneGsmParserBase* aManufacturerSpecific, CPhoneGsmParserBase* aEmergencyNumberParser, - CPhoneGsmParserBase* aVoipNumber, - CPhoneGsmParserBase* aImeiParser ) + CPhoneGsmParserBase* aVoipNumber) { // Ownership of these instances is transferred, thus // creation of the instance must not leave. @@ -56,8 +55,7 @@ aPhoneNumber, aManufacturerSpecific, aEmergencyNumberParser, - aVoipNumber, - aImeiParser ); + aVoipNumber); if ( !self ) { @@ -67,7 +65,6 @@ delete aManufacturerSpecific; delete aEmergencyNumberParser; delete aVoipNumber; - delete aImeiParser; User::Leave( KErrNoMemory ); } @@ -91,7 +88,6 @@ delete iGsmManufacturerProcedure; delete iGsmEmergencyNumber; delete iVoipNumber; - delete iImeiParser; CPhoneParserFeatures::Free(); } @@ -105,15 +101,13 @@ CPhoneGsmParserBase* aPhoneNumber, CPhoneGsmParserBase* aManufacturerSpecific, CPhoneGsmParserBase* aEmergencyNumberParser, - CPhoneGsmParserBase* aVoipNumber, - CPhoneGsmParserBase* aImeiParser ) + CPhoneGsmParserBase* aVoipNumber) : iGsmSsProcedure( aSsProcedure ), iGsmSimControlProcedure( aSimControlProcedure ), iGsmPhoneNumber( aPhoneNumber ), iGsmManufacturerProcedure( aManufacturerSpecific ), iGsmEmergencyNumber( aEmergencyNumberParser ), - iVoipNumber( aVoipNumber ), - iImeiParser( aImeiParser ) + iVoipNumber( aVoipNumber ) { } @@ -149,10 +143,6 @@ { iVoipNumber = CPhoneGsmDummyParser::NewL(); } - if ( !iImeiParser ) - { - iImeiParser = CPhoneGsmDummyParser::NewL(); - } } // ----------------------------------------------------------------------------- @@ -198,15 +188,9 @@ } TBool sendOperation = aOptions.FindOptionStatus( KPhoneOptionSend ); - - // Check if it is the only phone control string, show imei. - result = iImeiParser->ParseL( aString, aResult, aOptions ); // Check if emergency number. - if ( !result ) - { - result = iGsmEmergencyNumber->ParseL( aString, aResult, aOptions ); - } + result = iGsmEmergencyNumber->ParseL( aString, aResult, aOptions ); // First check if string is GSM ss procedure supported by MS. if ( !result ) diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/src/CPhoneParserFeatures.cpp --- a/telutils/phoneparser/src/CPhoneParserFeatures.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/phoneparser/src/CPhoneParserFeatures.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -130,16 +130,6 @@ } // ----------------------------------------------------------------------------- -// CPhoneParserFeatures::LifeTimerEnabled -// ----------------------------------------------------------------------------- -// -TBool CPhoneParserFeatures::LifeTimerEnabled() - { - return Instance() ? - Instance()->GetTelephoneVariant() & KTelSrvLVFlagLifeTimer : EFalse; - } - -// ----------------------------------------------------------------------------- // CPhoneParserFeatures::TwoDigitCallingEnabled // ----------------------------------------------------------------------------- // diff -r 7eb70891911c -r a2467631ae02 telutils/phoneparser/src/PhoneGsmParser.cpp --- a/telutils/phoneparser/src/PhoneGsmParser.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/telutils/phoneparser/src/PhoneGsmParser.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -34,15 +34,12 @@ #include "cphonegsmemergencynumberparser.h" #include "cphoneparserfeatures.h" #include "cphonevoipnumberparser.h" -#include "cphonegsmimeiparser.h" - // CONSTANTS const TInt KPhoneParserResultParameterReserver = 10; _LIT( KPhoneParserPanic, "PhoneParser" ); // Software version display code -_LIT( KPhoneCodeSwVersion, "*#0000#" ); _LIT( KPhoneCodeBadPinChange, "**04*" ); _LIT( KPhoneCodeBadPin2Change, "**042*" ); _LIT( KPhoneCodeBadPinUnblock, "**05*" ); @@ -50,7 +47,6 @@ _LIT( KPhoneCodeActivateRfsNormal, "*#7780#" ); _LIT( KPhoneCodeActivateRfsDeep, "*#7370#" ); _LIT( KPhoneCodeBtAddress, "*#2820#" ); -_LIT( KPhoneCodeLifeTimer, "*#92702689#" ); _LIT( KPhoneCodeRFLoopback, "*#9990#" ); _LIT( KPhoneCodeWLANMAC, "*#62209526#" ); _LIT( KPhoneCodeBtDebugMode, "*#2873#" ); @@ -99,10 +95,6 @@ CPhoneGsmParserBase* voipNumberParser = CPhoneVoipNumberParser::NewLC(); - // 7. IMEI PARSER TO STACK - CPhoneGsmParserBase* imeiParser = - CPhoneGsmImeiParser::NewLC(); - CPhoneGsmParser* parser = CPhoneGsmParser::NewL( ssContainer, @@ -110,10 +102,9 @@ phoneNumber, manufacturerSpecific, emergencyNumberParser, - voipNumberParser, - imeiParser ); + voipNumberParser); - CleanupStack::Pop( 7, ssContainer ); + CleanupStack::Pop( 6, ssContainer ); return parser; } @@ -233,13 +224,11 @@ // Allowed: // 0 SEND - // IMEI - // All manufacturer codes (incl. SW version) + // All manufacturer codes // All sim control procedures // All pcn procedures return ( uid == KPhoneUidCommand0 || - uid == KPhoneUidIMEI || uid == KPhoneUidManufacturerDebugCode || uid == KPhoneUidManufacturerCode || PHONE_EXTRACT_MAIN( uid ) == KPhoneGsmUidSimControlProcedure || @@ -258,18 +247,14 @@ // Allowed: // DialEmergency - // IMEI - // Some manufacturer codes (incl. SW version) + // Some manufacturer codes // All sim control procedures // All pcn procedures return ( uid == KPhoneUidEmergencyNumber || - uid == KPhoneUidIMEI || uid == KPhoneUidManufacturerDebugCode || ( uid == KPhoneUidManufacturerCode && - ( aux == CPhoneGsmManufacturerHandler::EShowVersion || - aux == CPhoneGsmManufacturerHandler::ELifeTimer || - aux == CPhoneGsmManufacturerHandler::EBadPinChange || + ( aux == CPhoneGsmManufacturerHandler::EBadPinChange || aux == CPhoneGsmManufacturerHandler::EBadPin2Change || aux == CPhoneGsmManufacturerHandler::EBadPinUnblock || aux == CPhoneGsmManufacturerHandler::EBadPin2Unblock ) ) || @@ -326,11 +311,6 @@ manufacturer->AddL( *manuCodes ); CleanupStack::Pop( manuCodes ); - manuCodes->AddStringL( - KPhoneCodeSwVersion, - CPhoneGsmManufacturerParser::EFlagCode, - CPhoneGsmManufacturerHandler::EShowVersion ); - manuCodes->AddStringL( KPhoneCodeBadPinChange, CPhoneGsmManufacturerParser::EFlagCode + @@ -377,14 +357,6 @@ CPhoneGsmManufacturerHandler::EShowWlanMac, KFeatureIdProtocolWlan ); - if ( CPhoneParserFeatures::LifeTimerEnabled()) - { - manuCodes->AddStringL( - KPhoneCodeLifeTimer, - CPhoneGsmManufacturerParser::EFlagCode, - CPhoneGsmManufacturerHandler::ELifeTimer ); - } - manuCodes->AddStringL( KPhoneCodeRFLoopback, CPhoneGsmManufacturerParser::EFlagCode, diff -r 7eb70891911c -r a2467631ae02 vmbx/vmbxcpplugin/src/vmbxcpgroup.cpp --- a/vmbx/vmbxcpplugin/src/vmbxcpgroup.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/vmbx/vmbxcpplugin/src/vmbxcpgroup.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -197,7 +197,7 @@ QString number(""); if (EVmbxVoice == vmbxType) { - if (mCsVideo1Editor && mUiEngine){ + if (mCsVoice1Editor && mUiEngine){ mUiEngine->getCsVoiceNumber(number); _DBGLOG2("VmbxCpGroup::updateVmbxNumber\ number=", number) diff -r 7eb70891911c -r a2467631ae02 vmbx/vmbxengine/inc/vmbxpbkstore.h --- a/vmbx/vmbxengine/inc/vmbxpbkstore.h Fri Jun 11 14:07:16 2010 +0300 +++ b/vmbx/vmbxengine/inc/vmbxpbkstore.h Wed Jun 23 18:49:32 2010 +0300 @@ -138,12 +138,10 @@ /** * Retrieves the Mailbox numbers identifier information - * @param in aAlsLine curent als line * @param out aInfo information from RPhonebookStore * @retuns KErrNone if succesful **/ - TInt GetMbdnInfo( const TVmbxAlsLineType aAlsLine, - RMobilePhone::TMobilePhoneVoicemailIdsV3& aInfo ); + TInt GetMbdnInfo( RMobilePhone::TMobilePhoneVoicemailIdsV3& aInfo ); /** diff -r 7eb70891911c -r a2467631ae02 vmbx/vmbxengine/src/vmbxpbkstore.cpp --- a/vmbx/vmbxengine/src/vmbxpbkstore.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/vmbx/vmbxengine/src/vmbxpbkstore.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -176,7 +176,22 @@ if ( KErrNone == newErr ) { // get als line info - simEntry->SetVmbxAlsLineType( VmbxUtilities::AlsLine() ); + TVmbxAlsLineType alsLine = VmbxUtilities::AlsLine(); + simEntry->SetVmbxAlsLineType( alsLine ); + // ALS line on + if ( EVmbxAlsLineDefault != alsLine ) + { + // ALS line on, only should write to 6f17, + // so just check 6f17 file write access + iPhoneBookType = EVMBXPhoneBook; + } + // ALS line off + else + { + // ALS line on, only should write to 6fc7, + //so just check 6fc7 file write access + iPhoneBookType = EMBDNPhoneBook; + } simEntry->SetVoiceMailboxType( EVmbxVoice ); simEntry->SetServiceId( KVmbxServiceVoice ); TRAPD( err, SimReadL( *simEntry ) ); @@ -271,7 +286,7 @@ if ( iPhoneBookType == EMBDNPhoneBook ) { RMobilePhone::TMobilePhoneVoicemailIdsV3 mbdnInfo; - result = GetMbdnInfo( VmbxUtilities::AlsLine(), mbdnInfo ); + result = GetMbdnInfo( mbdnInfo ); if ( KErrNone == result ) { @@ -324,8 +339,7 @@ // CVmbxPbkStore::GetMbdnInfo // --------------------------------------------------------------------------- // -TInt CVmbxPbkStore::GetMbdnInfo( const TVmbxAlsLineType aAlsLine, - RMobilePhone::TMobilePhoneVoicemailIdsV3& aInfo ) +TInt CVmbxPbkStore::GetMbdnInfo( RMobilePhone::TMobilePhoneVoicemailIdsV3& aInfo ) { VMBLOGSTRING( "VMBX: CVmbxPbkStore::GetMbdnInfo =>" ); TInt result( KErrInUse ); @@ -344,7 +358,7 @@ SetActive(); iWait->Start(); - VMBLOGSTRING2( "VMBX: CVmbxPbkStore::GetMbdnInfo: iVoice value %I", + VMBLOGSTRING2( "VMBX: CVmbxPbkStore::GetMbdnInfo: iVoice original value %I", aInfo.iVoice ); if ( iStatus.Int() == KErrNotFound ) { @@ -356,12 +370,12 @@ { result = iStatus.Int(); } - - if ( EVmbxAlsLineDefault == aAlsLine ) + TVmbxAlsLineType alsLine = VmbxUtilities::AlsLine(); + if ( EVmbxAlsLineDefault == alsLine ) { aInfo.iVoice = EVmbxAlsLine1; } - VMBLOGSTRING2( "VMBX: CVmbxPbkStore::GetMbdnInfo: aInfo.iVoice %I", + VMBLOGSTRING2( "VMBX: CVmbxPbkStore::GetMbdnInfo: iVoice last value %I", aInfo.iVoice ); } VMBLOGSTRING2( "VMBX: CVmbxPbkStore::GetMbdnInfo: result %I<=", @@ -476,7 +490,7 @@ if ( iPhoneBookType == EMBDNPhoneBook ) { RMobilePhone::TMobilePhoneVoicemailIdsV3 mbdnInfo; - result = GetMbdnInfo( EVmbxAlsLine1, mbdnInfo ); + result = GetMbdnInfo( mbdnInfo ); if ( KErrNone == result ) { VMBLOGSTRING( "start MBDN PhoneBook read" ); diff -r 7eb70891911c -r a2467631ae02 vmbx/vmbxengine/src/vmbxqtuihandler.cpp --- a/vmbx/vmbxengine/src/vmbxqtuihandler.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/vmbx/vmbxengine/src/vmbxqtuihandler.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -167,9 +168,14 @@ // TODO Delete Operation will case panic on EM + +#ifdef __WINS__ + iQueryDialog->close(); +#else delete iQueryDialog; iQueryDialog = 0; - +#endif // __WINS__ + VMBLOGSTRING2("VmbxQtUiHandler::showVmbxQueryDialog aResult = %d", aResult) VMBLOGSTRING("VmbxQtUiHandler::showVmbxQueryDialog Exit") } @@ -229,11 +235,13 @@ VMBLOGSTRING2("VmbxQtUiHandler::showDefineSelectionDialog: aResult%d", \ aResult) - - // TODO Delete Operation will case panic on EM +#ifdef __WINS__ + defineListDialog->close(); +#else delete defineListDialog; defineListDialog = 0; - +#endif // __WINS__ + VMBLOGSTRING("VmbxQtUiHandler::showDefineSelectionDialog Exit") } @@ -329,8 +337,13 @@ params.iType) VMBLOGSTRING2("VmbxQtUiHandler::showCallSelectionDialog: result%d", result) + +#ifdef __WINS__ + callListDialog->close(); +#else delete callListDialog; callListDialog = 0; +#endif // __WINS__ VMBLOGSTRING("VmbxQtUiHandler::showCallSelectionDialog Exit") } @@ -374,20 +387,7 @@ VMBLOGSTRING("VmbxQtUiHandler::ShowInformationNote default") break; } - HbMessageBox *msgBox = 0; - if (EInvalidNumber == aType) { - msgBox = new HbMessageBox(HbMessageBox::MessageTypeWarning); - } else { - msgBox = new HbMessageBox(HbMessageBox::MessageTypeInformation); - } - msgBox->setText(noteText); - msgBox->setTimeout( HbDialog::StandardTimeout ); - msgBox->clearActions(); - DialogWaiter waiter; - msgBox->open(&waiter, SLOT(done(HbAction *))); - waiter.wait(); - delete msgBox; - msgBox = 0; + HbNotificationDialog::launchDialog(noteText); VMBLOGSTRING("VmbxQtUiHandler::showInformationNote Exit") } diff -r 7eb70891911c -r a2467631ae02 vmbx/vmbxengine/src/voicemailboximpl.cpp --- a/vmbx/vmbxengine/src/voicemailboximpl.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/vmbx/vmbxengine/src/voicemailboximpl.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -31,9 +31,7 @@ #include "voicemailboximpl.h" // phone application uid -//const TInt KPhoneApplicationUid = 0x100058B3; -// Temp! using contropannel vmbxcp plugin uid for testing -const TInt KPhoneApplicationUid = 0x20025FD9; +const TInt KPhoneApplicationUid = 0x100058B3; // ============================ MEMBER FUNCTIONS ============================= diff -r 7eb70891911c -r a2467631ae02 vmbx/vmbxengine/vmbxengine.pro --- a/vmbx/vmbxengine/vmbxengine.pro Fri Jun 11 14:07:16 2010 +0300 +++ b/vmbx/vmbxengine/vmbxengine.pro Wed Jun 23 18:49:32 2010 +0300 @@ -33,16 +33,17 @@ ../../inc \ ./inc - LIBS += -lcentralrepository.dll \ - -lcenrepnotifhandler.dll \ - -lfeatmgr.dll \ - -lphoneclient.dll \ - -lsssettings.dll \ - -letelmm.dll \ - -letel.dll \ - -lsatclient.dll \ - -lserviceprovidersettings.dll \ - -lFlogger.dll + LIBS += -lcentralrepository \ + -lcenrepnotifhandler \ + -lfeatmgr \ + -lphoneclient \ + -lsssettings \ + -letelmm \ + -letel \ + -lsatclient \ + -lserviceprovidersettings \ + -lefsrv \ + -lFlogger HEADERS += inc/mvmbxcenrephandler.h \ inc/mvmbxcenrepobserver.h \