# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1271421118 -10800 # Node ID e32024264ebb5849e33dc806e7cb26d3870d7c96 # Parent ae8abd0db65c9d4fd8c41c77b2d2dc2e3db65f98 Revision: 201011 Kit: 201015 diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Group/Psui.mmp --- a/cellular/PsetNotesUi/Group/Psui.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Group/Psui.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -25,22 +25,22 @@ TARGETTYPE dll UID 0x1000008d 0x100059C6 -SOURCEPATH ../Src -SOURCE PsuiBarringObs.cpp -SOURCE PsuiWaitingObs.cpp -SOURCE PsuiDivertObs.cpp -SOURCE PsuiNoteMaster.cpp -SOURCE PsuiResourceLoader.cpp -SOURCE PsuiContainer.cpp -SOURCE PsuiCliObserver.cpp -SOURCE PsuiVariationProxy.cpp +SOURCEPATH ../src +SOURCE psuibarringobs.cpp +SOURCE psuiwaitingobs.cpp +SOURCE psuidivertobs.cpp +SOURCE psuinotemaster.cpp +SOURCE psuiresourceloader.cpp +SOURCE psuicontainer.cpp +SOURCE psuicliobserver.cpp +SOURCE psuivariationproxy.cpp #ifdef RD_PHONE_NG -SOURCE PsuiQueryDialog.cpp +SOURCE psuiquerydialog.cpp #endif // RD_PHONE_NG -SOURCE PsuiReqObserver.cpp -SOURCE PsuiNoteController.cpp +SOURCE psuireqobserver.cpp +SOURCE psuinotecontroller.cpp -START RESOURCE ../data/Psui.rss +START RESOURCE ../data/psui.rss HEADER TARGETPATH RESOURCE_FILES_DIR // Language definition @@ -50,7 +50,7 @@ SYSTEMINCLUDE ../../../inc -USERINCLUDE . ../Inc +USERINCLUDE . ../inc MW_LAYER_SYSTEMINCLUDE LIBRARY bafl.lib diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Group/bld.inf --- a/cellular/PsetNotesUi/Group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -22,15 +22,15 @@ DEFAULT PRJ_MMPFILES -../Group/Psui.mmp +../group/psui.mmp PRJ_EXPORTS -../inc/PsuiResourceLoader.h |../../../inc/PsuiResourceLoader.h -../data/psui_stub.SIS /epoc32/data/z/system/install/psui_stub.SIS +../inc/psuiresourceloader.h |../../../inc/psuiresourceloader.h +../data/psui_stub.sis /epoc32/data/z/system/install/psui_stub.sis // IBY Files -../rom/Psui.iby CORE_APP_LAYER_IBY_EXPORT_PATH(Psui.iby) -../rom/PsuiResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(PsuiResources.iby) +../rom/psui.iby CORE_APP_LAYER_IBY_EXPORT_PATH(psui.iby) +../rom/psuiresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(psuiresources.iby) // LOC files ../loc/psui.loc MW_LAYER_LOC_EXPORT_PATH(psui.loc) diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Inc/PsuiNoteController.h --- a/cellular/PsetNotesUi/Inc/PsuiNoteController.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Inc/PsuiNoteController.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include "PsuiNoteMaster.h" +#include "psuinotemaster.h" // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Inc/PsuiNoteMaster.h --- a/cellular/PsetNotesUi/Inc/PsuiNoteMaster.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Inc/PsuiNoteMaster.h Fri Apr 16 15:31:58 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include "psuiconstants.h" -#include "PsuiInternalConstants.h" +#include "psuiinternalconstants.h" #include "psetcalldiverting.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Inc/PsuiReqObserver.h --- a/cellular/PsetNotesUi/Inc/PsuiReqObserver.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Inc/PsuiReqObserver.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include -#include "PsuiNoteMaster.h" +#include "psuinotemaster.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiBarringObs.cpp --- a/cellular/PsetNotesUi/Src/PsuiBarringObs.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiBarringObs.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ #include #include -#include "PsuiInternalConstants.h" -#include "PsuiNoteController.h" +#include "psuiinternalconstants.h" +#include "psuinotecontroller.h" // MEMBER FUNCTIONS // --------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiCliObserver.cpp --- a/cellular/PsetNotesUi/Src/PsuiCliObserver.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiCliObserver.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ #include "psuicliobserver.h" #include "psuicontainer.h" -#include "PsuiNoteController.h" +#include "psuinotecontroller.h" // MEMBER FUNCTIONS diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiContainer.cpp --- a/cellular/PsetNotesUi/Src/PsuiContainer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiContainer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ //INCLUDES #include -#include "PsuiResourceLoader.h" +#include "psuiresourceloader.h" // --------------------------------------------------------------------------- // Symbian OS two-phased constructor. diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiDivertObs.cpp --- a/cellular/PsetNotesUi/Src/PsuiDivertObs.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiDivertObs.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ #include #include -#include "PsuiNoteController.h" +#include "psuinotecontroller.h" // --------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiNoteController.cpp --- a/cellular/PsetNotesUi/Src/PsuiNoteController.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiNoteController.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,8 +17,8 @@ // INCLUDE FILES -#include "PsuiNoteController.h" -#include "PsuiInternalConstants.h" +#include "psuinotecontroller.h" +#include "psuiinternalconstants.h" // ================= MEMBER FUNCTIONS ======================= diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiNoteMaster.cpp --- a/cellular/PsetNotesUi/Src/PsuiNoteMaster.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiNoteMaster.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -30,10 +30,10 @@ #include #include -#include "PsuiInternalConstants.h" -#include "PsuiNoteMaster.h" -#include "PsuiReqObserver.h" -#include "PsuiQueryDialog.h" +#include "psuiinternalconstants.h" +#include "psuinotemaster.h" +#include "psuireqobserver.h" +#include "psuiquerydialog.h" #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp --- a/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include "PsuiQueryDialog.h" +#include "psuiquerydialog.h" // ================= MEMBER FUNCTIONS ======================= diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiReqObserver.cpp --- a/cellular/PsetNotesUi/Src/PsuiReqObserver.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiReqObserver.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include "PsuiReqObserver.h" +#include "psuireqobserver.h" // MACROS diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiResourceLoader.cpp --- a/cellular/PsetNotesUi/Src/PsuiResourceLoader.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiResourceLoader.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #include #include -#include "PsuiResourceLoader.h" +#include "psuiresourceloader.h" // CONSTANTS _LIT( KPsuiResourceFileNameAndPath, "Z:\\resource\\Psui.rsc" ); diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiVariationProxy.cpp --- a/cellular/PsetNotesUi/Src/PsuiVariationProxy.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiVariationProxy.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ */ -#include "PsuiVariationProxy.h" +#include "psuivariationproxy.h" #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp --- a/cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,9 +21,9 @@ #include #include -#include "PsuiInternalConstants.h" -#include "PsuiNoteController.h" -#include "PsuiVariationProxy.h" +#include "psuiinternalconstants.h" +#include "psuinotecontroller.h" +#include "psuivariationproxy.h" // MEMBER FUNCTIONS // --------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb cellular/PsetNotesUi/tsrc/public/basic/Src/T_PSetNotesUi.cpp --- a/cellular/PsetNotesUi/tsrc/public/basic/Src/T_PSetNotesUi.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/PsetNotesUi/tsrc/public/basic/Src/T_PSetNotesUi.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include // INTERNAL INCLUDES diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/Logger/SSSettingsLogger.h --- a/cellular/SSSettings/Logger/SSSettingsLogger.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/Logger/SSSettingsLogger.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ #ifndef SSSETTINGSLOGGER_H #define SSSETTINGSLOGGER_H -#include "SSSettingsLoggingConf.h" +#include "sssettingsloggingconf.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/group/SSSettings.mmp --- a/cellular/SSSettings/group/SSSettings.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/group/SSSettings.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -16,7 +16,7 @@ */ #include -#include "../logger/SSSettingsLoggingConf.h" +#include "../logger/sssettingsloggingconf.h" TARGET sssettings.dll @@ -29,16 +29,16 @@ CAPABILITY CAP_GENERAL_DLL sourcepath ../src -SOURCE RSSSettings.cpp -SOURCE CSSSettingsNotifier.cpp -SOURCE CSSSettingsAlsNotifier.cpp -SOURCE RCustomerServiceProfileCache.cpp -SOURCE CSSSettingsRefreshContainer.cpp -SOURCE CSSSettingsRefreshHandler.cpp -SOURCE CSSSettingsActiveObject.cpp +SOURCE rsssettings.cpp +SOURCE csssettingsnotifier.cpp +SOURCE csssettingsalsnotifier.cpp +SOURCE rcustomerserviceprofilecache.cpp +SOURCE csssettingsrefreshcontainer.cpp +SOURCE csssettingsrefreshhandler.cpp +SOURCE csssettingsactiveobject.cpp USERINCLUDE ../inc -USERINCLUDE ../Logger +USERINCLUDE ../logger SYSTEMINCLUDE ../inc MW_LAYER_SYSTEMINCLUDE diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/group/bld.inf --- a/cellular/SSSettings/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -23,15 +23,15 @@ PRJ_EXPORTS -../inc/CSSSettingsRefreshContainer.h |../../../inc/CSSSettingsRefreshContainer.h -../inc/MSSSettingsRefreshHandler.h |../../../inc/MSSSettingsRefreshHandler.h +../inc/csssettingsrefreshcontainer.h |../../../inc/csssettingsrefreshcontainer.h +../inc/msssettingsrefreshhandler.h |../../../inc/msssettingsrefreshhandler.h -../group/SSSettings_stub.SIS /epoc32/data/z/system/install/SSSettings_stub.SIS +../group/sssettings_stub.sis /epoc32/data/z/system/install/sssettings_stub.sis // IBY files -../rom/SSSettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(SSSettings.iby) +../rom/sssettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(sssettings.iby) PRJ_MMPFILES -../group/SSSettings.mmp +../group/sssettings.mmp //End of file diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/inc/CSSSettingsAlsNotifier.h --- a/cellular/SSSettings/inc/CSSSettingsAlsNotifier.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/inc/CSSSettingsAlsNotifier.h Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ #include #include "rsssettings.h" -#include "CSSSettingsActiveObject.h" +#include "csssettingsactiveobject.h" // FORWARD DECLARATIONS class RMmCustomAPI; diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/inc/CSSSettingsNotifier.h --- a/cellular/SSSettings/inc/CSSSettingsNotifier.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/inc/CSSSettingsNotifier.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ #include #include "rsssettings.h" -#include "CSSSettingsActiveObject.h" +#include "csssettingsactiveobject.h" // FORWARD DECLARATIONS class CSSSettingsAlsNotifier; diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/inc/CSSSettingsRefreshContainer.h --- a/cellular/SSSettings/inc/CSSSettingsRefreshContainer.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/inc/CSSSettingsRefreshContainer.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES -#include +#include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/inc/CSSSettingsRefreshHandler.h --- a/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES -#include +#include #include #include #include @@ -30,7 +30,7 @@ #include #include #include -#include "CSSSettingsActiveObject.h" +#include "csssettingsactiveobject.h" // DATA TYPES diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/rom/SSSettings.iby --- a/cellular/SSSettings/rom/SSSettings.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/rom/SSSettings.iby Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ #ifndef __SSSETTINGS_IBY__ #define __SSSETTINGS_IBY__ -file=ABI_DIR\BUILD_DIR\SSSettings.dll SHARED_LIB_DIR\sssettings.dll -data=ZSYSTEM\install\sssettings_stub.SIS System\Install\sssettings_stub.SIS +file=ABI_DIR\BUILD_DIR\sssettings.dll SHARED_LIB_DIR\sssettings.dll +data=ZSYSTEM\install\sssettings_stub.sis System\Install\sssettings_stub.sis #endif diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/src/CSSSettingsActiveObject.cpp --- a/cellular/SSSettings/src/CSSSettingsActiveObject.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/src/CSSSettingsActiveObject.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include "CSSSettingsActiveObject.h" +#include "csssettingsactiveobject.h" #include diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/src/CSSSettingsAlsNotifier.cpp --- a/cellular/SSSettings/src/CSSSettingsAlsNotifier.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/src/CSSSettingsAlsNotifier.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,13 +21,13 @@ #include #include #include -#include // sssettings pub&sub keys. -#include // sssettings centrep keys. +#include // sssettings pub&sub keys. +#include // sssettings centrep keys. #include -#include "CSSSettingsAlsNotifier.h" -#include "CSSSettingsActiveObject.h" -#include "SSSettingsLogger.h" +#include "csssettingsalsnotifier.h" +#include "csssettingsactiveobject.h" +#include "sssettingslogger.h" // ================= MEMBER FUNCTIONS ======================= // ----------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/src/CSSSettingsNotifier.cpp --- a/cellular/SSSettings/src/CSSSettingsNotifier.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/src/CSSSettingsNotifier.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,12 +19,12 @@ // INCLUDE FILES #include #include -#include +#include -#include "CSSSettingsNotifier.h" +#include "csssettingsnotifier.h" #include "msssettingsobserver.h" -#include "CSSSettingsAlsNotifier.h" -#include "SSSettingsLogger.h" +#include "csssettingsalsnotifier.h" +#include "sssettingslogger.h" // DATA TYPES diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/src/CSSSettingsRefreshContainer.cpp --- a/cellular/SSSettings/src/CSSSettingsRefreshContainer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/src/CSSSettingsRefreshContainer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include -#include "CSSSettingsRefreshHandler.h" +#include +#include "csssettingsrefreshhandler.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp --- a/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -23,9 +23,9 @@ #include // bt sap central repository key. #include -#include "CSSSettingsRefreshHandler.h" -#include "SSSettingsLogger.h" -#include "CSSSettingsActiveObject.h" +#include "csssettingsrefreshhandler.h" +#include "sssettingslogger.h" +#include "csssettingsactiveobject.h" // ============================= LOCAL FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/src/RCustomerServiceProfileCache.cpp --- a/cellular/SSSettings/src/RCustomerServiceProfileCache.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/src/RCustomerServiceProfileCache.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,13 +19,13 @@ // INCLUDE FILES #include // for feature definitions #include -#include +#include #include #include #include #include "rcustomerserviceprofilecache.h" -#include "SSSettingsLogger.h" +#include "sssettingslogger.h" // CONSTANTS #define KSSSettingsTSYName KMmTsyModuleName diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/src/RSSSettings.cpp --- a/cellular/SSSettings/src/RSSSettings.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/src/RSSSettings.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -26,15 +26,15 @@ #include #include #include // central repository -#include // settings central repository keys. +#include // settings central repository keys. #include #include #include "rsssettings.h" #include "msssettingsobserver.h" -#include "CSSSettingsNotifier.h" -#include "CSSSettingsAlsNotifier.h" -#include "SSSettingsLogger.h" +#include "csssettingsnotifier.h" +#include "csssettingsalsnotifier.h" +#include "sssettingslogger.h" // CONSTANTS _LIT( KPanicCat, "SSSettings" ); diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/tsrc/public/basic/EunitTest/Group/bld.inf --- a/cellular/SSSettings/tsrc/public/basic/EunitTest/Group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/tsrc/public/basic/EunitTest/Group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -29,6 +29,6 @@ PRJ_MMPFILES PRJ_TESTMMPFILES -../Group/MT_SSSettings.mmp +../group/MT_SSSettings.mmp // End of file diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.cpp --- a/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ // EXTERNAL INCLUDES #include #include -#include -#include +#include +#include #include // INTERNAL INCLUDES diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.h --- a/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/tsrc/public/basic/group/bld.inf --- a/cellular/SSSettings/tsrc/public/basic/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/tsrc/public/basic/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include "../EunitTest/Group/bld.inf" +#include "../EunitTest/group/bld.inf" // End of file diff -r ae8abd0db65c -r e32024264ebb cellular/SSSettings/xqbindings/sssettingswrapper/tsrc/mocks/mock_rsssettings.cpp --- a/cellular/SSSettings/xqbindings/sssettingswrapper/tsrc/mocks/mock_rsssettings.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/SSSettings/xqbindings/sssettingswrapper/tsrc/mocks/mock_rsssettings.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,7 +16,7 @@ */ #include -#include +#include // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/ServiceRequest/data/ServiceRequest.rss --- a/cellular/ServiceRequest/data/ServiceRequest.rss Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/ServiceRequest/data/ServiceRequest.rss Fri Apr 16 15:31:58 2010 +0300 @@ -29,7 +29,7 @@ #include #include -#include "ServiceRequest.hrh" +#include "servicerequest.hrh" RESOURCE RSS_SIGNATURE { } diff -r ae8abd0db65c -r e32024264ebb cellular/ServiceRequest/group/ServiceRequest.mmp --- a/cellular/ServiceRequest/group/ServiceRequest.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/ServiceRequest/group/ServiceRequest.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -26,10 +26,10 @@ UID 0x1000008d 0x10005A3D SOURCEPATH ../src -SOURCE CServiceRequest.cpp +SOURCE cservicerequest.cpp // Resource files -START RESOURCE ../data/ServiceRequest.rss +START RESOURCE ../data/servicerequest.rss TARGETPATH RESOURCE_FILES_DIR HEADER LANGUAGE_IDS diff -r ae8abd0db65c -r e32024264ebb cellular/ServiceRequest/group/bld.inf --- a/cellular/ServiceRequest/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/ServiceRequest/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -21,14 +21,14 @@ DEFAULT PRJ_EXPORTS -../inc/CServiceRequest.h |../../../inc/CServiceRequest.h -../inc/MServiceRequestObserver.h |../../../inc/MServiceRequestObserver.h -../data/servicerequest_stub.SIS /epoc32/data/z/system/install/servicerequest_stub.SIS +../inc/cservicerequest.h |../../../inc/cservicerequest.h +../inc/mservicerequestobserver.h |../../../inc/mservicerequestobserver.h +../data/servicerequest_stub.sis /epoc32/data/z/system/install/servicerequest_stub.sis ../rom/servicerequest.iby CORE_APP_LAYER_IBY_EXPORT_PATH(servicerequest.iby) -../rom/servicerequestResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(servicerequestResources.iby) +../rom/servicerequestresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(servicerequestresources.iby) PRJ_MMPFILES -../group/ServiceRequest.mmp +../group/servicerequest.mmp // End of File diff -r ae8abd0db65c -r e32024264ebb cellular/ServiceRequest/rom/servicerequest.iby --- a/cellular/ServiceRequest/rom/servicerequest.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/ServiceRequest/rom/servicerequest.iby Fri Apr 16 15:31:58 2010 +0300 @@ -19,8 +19,8 @@ #ifndef __SERVICEREQUEST_IBY__ #define __SERVICEREQUEST_IBY__ -file=ABI_DIR\BUILD_DIR\SERVICEREQUEST.DLL SHARED_LIB_DIR\SERVICEREQUEST.DLL +file=ABI_DIR\BUILD_DIR\servicerequest.dll SHARED_LIB_DIR\servicerequest.dll -data=ZSYSTEM\install\Servicerequest_stub.sis System\Install\Servicerequest_stub.sis +data=ZSYSTEM\install\servicerequest_stub.sis System\Install\servicerequest_stub.sis #endif diff -r ae8abd0db65c -r e32024264ebb cellular/ServiceRequest/src/CServiceRequest.cpp --- a/cellular/ServiceRequest/src/CServiceRequest.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/ServiceRequest/src/CServiceRequest.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CServiceRequest.h" -#include "MServiceRequestObserver.h" +#include "cservicerequest.h" +#include "mservicerequestobserver.h" #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/group/bld.inf --- a/cellular/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -17,8 +17,8 @@ #include "../telephonysettings/group/bld.inf" -#include "../SSSettings/group/bld.inf" -#include "../PsetNotesUi/Group/bld.inf" -#include "../ServiceRequest/group/bld.inf" +#include "../sssettings/group/bld.inf" +#include "../psetnotesui/group/bld.inf" +#include "../servicerequest/group/bld.inf" // End of File \ No newline at end of file diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/Logger/PhoneSettingsLogger.h --- a/cellular/telephonysettings/Logger/PhoneSettingsLogger.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/Logger/PhoneSettingsLogger.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ #ifndef PHONESETTINGSLOGGER_H #define PHONESETTINGSLOGGER_H -#include "PhoneSettingsLoggingConf.h" +#include "phonesettingsloggingconf.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/group/bld.inf --- a/cellular/telephonysettings/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -26,9 +26,9 @@ PRJ_EXPORTS -../group/phonesettings_stub.SIS /epoc32/data/z/system/install/phonesettings_stub.SIS +../group/phonesettings_stub.sis /epoc32/data/z/system/install/phonesettings_stub.sis // IBY files -../rom/PhoneSettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(PhoneSettings.iby) +../rom/phonesettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(phonesettings.iby) // End of file diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/group/phonesettings.mmp --- a/cellular/telephonysettings/group/phonesettings.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/group/phonesettings.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ */ #include -#include "../logger/PhoneSettingsLoggingConf.h" +#include "../logger/phonesettingsloggingconf.h" // Capability assignment. CAPABILITY CAP_GENERAL_DLL @@ -28,26 +28,26 @@ UID 0x1000008d 0x100058e3 SOURCEPATH ../src -SOURCE PsetCallWaiting.cpp -SOURCE PsetContainer.cpp -SOURCE PsetCallBarring.cpp -SOURCE PsetCallDiverting.cpp -SOURCE PsetTelephony.cpp -SOURCE PsetCli.cpp -SOURCE PsetVariationProxy.cpp -SOURCE PsetNetwork.cpp -SOURCE PsetSAObserver.cpp -SOURCE PsetCSP.cpp -SOURCE PSetUtility.cpp -SOURCE PSetRefreshHandlerImpl.cpp -SOURCE PSetCallDivertingBase.cpp -SOURCE PSetSubscriberIdCheck.cpp -SOURCE PSetCallDivertingBasicImpl.cpp -SOURCE PSetCallDivertingCreator.cpp -SOURCE PSetCallDivertingDualAffectImpl.cpp +SOURCE psetcallwaiting.cpp +SOURCE psetcontainer.cpp +SOURCE psetcallbarring.cpp +SOURCE psetcalldiverting.cpp +SOURCE psettelephony.cpp +SOURCE psetcli.cpp +SOURCE psetvariationproxy.cpp +SOURCE psetnetwork.cpp +SOURCE psetsaobserver.cpp +SOURCE psetcsp.cpp +SOURCE psetutility.cpp +SOURCE psetrefreshhandlerimpl.cpp +SOURCE psetcalldivertingbase.cpp +SOURCE psetsubscriberidcheck.cpp +SOURCE psetcalldivertingbasicimpl.cpp +SOURCE psetcalldivertingcreator.cpp +SOURCE psetcalldivertingdualaffectimpl.cpp USERINCLUDE ../inc -USERINCLUDE ../Logger +USERINCLUDE ../logger SYSTEMINCLUDE ../../../inc // APP include needed because telephonysettings // uses vmbx headers from APP layer. diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/inc/PSetCallDivertingBase.h --- a/cellular/telephonysettings/inc/PSetCallDivertingBase.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/inc/PSetCallDivertingBase.h Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include "MCallDiverting.h" +#include "mcalldiverting.h" #include "msssettingsobserver.h" #include "nwdefs.h" #include "psetconstants.h" @@ -66,12 +66,10 @@ ~CPSetCallDivertingBase(); public: // From base class. -// <-- QT PHONE START --> /** * @see MCallDiverting. */ void SetRequestObserver( MPsetRequestObserver* aObs ); -// <-- QT PHONE END --> /** * @see MCallDiverting. @@ -117,12 +115,6 @@ /** * @see MCallDiverting. - */ - // <-- QT PHONE START--> - //TInt OpenVmbxLC( TDes& aTelNumber, RVmbxNumber& aVmbx ); - // <-- QT PHONE END--> - /** - * @see MCallDiverting. */ TInt GetNumbersFromSharedDataL( TInt aType, CDesC16ArrayFlat& aArray ); diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/inc/PSetCallDivertingBasicImpl.h --- a/cellular/telephonysettings/inc/PSetCallDivertingBasicImpl.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/inc/PSetCallDivertingBasicImpl.h Fri Apr 16 15:31:58 2010 +0300 @@ -27,7 +27,7 @@ #include "msssettingsobserver.h" #include "nwdefs.h" #include "psetconstants.h" -#include "PSetCallDivertingBase.h" +#include "psetcalldivertingbase.h" // CLASS DECLARATION class CPsetSAObserver; diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/inc/PSetCallDivertingCreator.h --- a/cellular/telephonysettings/inc/PSetCallDivertingCreator.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/inc/PSetCallDivertingCreator.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,13 +22,10 @@ // INCLUDES #include #include -// <-- QT PHONE START --> -//#include -// <-- QT PHONE END--> #include #include #include "mpsetdivertobs.h" -#include "MCallDiverting.h" +#include "mcalldiverting.h" /** * Factory class for creating divert related classes. diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/inc/PSetCallDivertingDualAffectImpl.h --- a/cellular/telephonysettings/inc/PSetCallDivertingDualAffectImpl.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/inc/PSetCallDivertingDualAffectImpl.h Fri Apr 16 15:31:58 2010 +0300 @@ -27,7 +27,7 @@ #include "msssettingsobserver.h" #include "nwdefs.h" #include "psetconstants.h" -#include "PSetCallDivertingBase.h" +#include "psetcalldivertingbase.h" // CLASS DECLARATION class CPsetSAObserver; diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/rom/PhoneSettings.iby --- a/cellular/telephonysettings/rom/PhoneSettings.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/rom/PhoneSettings.iby Fri Apr 16 15:31:58 2010 +0300 @@ -21,6 +21,6 @@ // Network Settings Engine Library file=ABI_DIR\BUILD_DIR\phonesettings.dll SHARED_LIB_DIR\phonesettings.dll -data=ZSYSTEM\install\phonesettings_stub.SIS System\Install\phonesettings_stub.SIS +data=ZSYSTEM\install\phonesettings_stub.sis System\Install\phonesettings_stub.sis #endif diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PSetCallDivertingBase.cpp --- a/cellular/telephonysettings/src/PSetCallDivertingBase.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PSetCallDivertingBase.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,14 +17,11 @@ // INCLUDE FILES -#include "PSetCallDivertingBasicImpl.h" +#include "psetcalldivertingbasicimpl.h" #include #include #include -// <-- QT PHONE START --> -//include -// <-- QT PHONE END --> #include #include #include @@ -33,13 +30,13 @@ #include "psetcalldiverting.h" #include "psetcontainer.h" #include "mpsetdivertobs.h" -#include "PsetTelephony.h" -#include "PSetPanic.h" +#include "psettelephony.h" +#include "psetpanic.h" #include "mpsetrequestobs.h" -#include "PSetUtility.h" -#include "PhoneSettingsLogger.h" +#include "psetutility.h" +#include "phonesettingslogger.h" #include "psetsaobserver.h" -#include "PSetCallDivertingBase.h" +#include "psetcalldivertingbase.h" // LOCAL CONSTANTS AND MACROS @@ -169,7 +166,6 @@ // Empty implementation. } -// <-- QT PHONE START --> // --------------------------------------------------------------------------- // SetRequestObserver // --------------------------------------------------------------------------- @@ -178,7 +174,6 @@ { iReqObserver = aObs; } -// <-- QT PHONE END --> // --------------------------------------------------------------------------- // SetDivertingL @@ -827,65 +822,11 @@ __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBase::IsVMBXDivertL" ); TBool result = EFalse; - // <-- QT PHONE START --> - - /* - if ( FeatureManager::FeatureSupported ( KFeatureIdVmbxCallDivertIcon ) ) - { - RVmbxNumber vmbxConnection; - TTelNumber telNumber; - TInt retValue = OpenVmbxLC( telNumber, vmbxConnection ); - __PHSLOGSTRING1("[PHS] CPSetCallDivertingBase::IsVMBXDivertL: telNumber = %S", &telNumber ); - __PHSLOGSTRING1("[PHS] CPSetCallDivertingBase::IsVMBXDivertL: retValue = %d", retValue ); - - CleanupStack::PopAndDestroy(); //vmbxConnection is closed when popped - if ( retValue == KErrNone ) //VMBX number found - { - - //Concatenate the existing number and add '*' to the beginning - TTelNumber tempStr; - tempStr.Zero(); - tempStr.Append( KPSetAsterisk ); - - //Match with seven characters - TInt matchChars = KPsetMatchingChars; - if ( telNumber.Length() < matchChars ) - { - matchChars = telNumber.Length(); - } - tempStr.Append( telNumber.Right( matchChars ) ); - - //Compare value with divert-to number - if ( aTelNumber.Match ( tempStr ) != KErrNotFound ) - { - __PHSLOGSTRING("[PHS] CPSetCallDivertingBase::IsVMBXDivertL: Match found" ); - result = ETrue; - } - } - } -*/ - // <-- QT PHONE END--> __PHSLOGSTRING("[PHS] <--CPSetCallDivertingBase::IsVMBXDivertL" ); return result; } // --------------------------------------------------------------------------- -// Opens Vmbx. Leaves vmbx to the stack. -// --------------------------------------------------------------------------- -// <-- QT PHONE START--> -/* -TInt CPSetCallDivertingBase::OpenVmbxLC( TDes& aTelNumber, RVmbxNumber& aVmbx ) - { - __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBase::OpenVmbxLC" ); - User::LeaveIfError( aVmbx.Open( iPhone ) ); - CleanupClosePushL( aVmbx ); - __PHSLOGSTRING("[PHS]<-- CPSetCallDivertingBase::OpenVmbxLC" ); - return aVmbx.GetVmbxNumber( aTelNumber ); - - } -*/ -// <-- QT PHONE END--> -// --------------------------------------------------------------------------- // If SsSettings notifies of settings change, copy new value to member variable. // --------------------------------------------------------------------------- void CPSetCallDivertingBase::PhoneSettingChanged( diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PSetCallDivertingBasicImpl.cpp --- a/cellular/telephonysettings/src/PSetCallDivertingBasicImpl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PSetCallDivertingBasicImpl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,14 +17,11 @@ // INCLUDE FILES -#include "PSetCallDivertingBasicImpl.h" +#include "psetcalldivertingbasicimpl.h" #include #include #include -// <-- QT PHONE START --> -//#include -// <-- QT PHONE END--> #include #include #include @@ -33,11 +30,11 @@ #include "psetcalldiverting.h" #include "psetcontainer.h" #include "mpsetdivertobs.h" -#include "PsetTelephony.h" -#include "PSetPanic.h" +#include "psettelephony.h" +#include "psetpanic.h" #include "mpsetrequestobs.h" -#include "PSetUtility.h" -#include "PhoneSettingsLogger.h" +#include "psetutility.h" +#include "phonesettingslogger.h" #include "psetsaobserver.h" // LOCAL CONSTANTS AND MACROS @@ -205,11 +202,9 @@ __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBasicImpl::RunL: EPSetChangeDivert" ); //Notify Observer iDivertStatus.iStatus = PSetUtility::GetChangeInfoStatus( iChangeInfo.iAction ); -// <-- QT PHONE START --> iDivertStatus.iNumber = iChangeInfo.iNumber.iTelNumber; iDivertStatus.iCondition = PSetUtility::GetDivertReason(iReason); iDivertStatus.iNoReplyTimer = iChangeInfo.iTimeout; -// <-- QT PHONE END --> // Check is done because of VOIP notification functionality(PSetNotesUI). if ( iVoiceDivert && !iVideoDivert ) { diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PSetCallDivertingCreator.cpp --- a/cellular/telephonysettings/src/PSetCallDivertingCreator.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PSetCallDivertingCreator.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,10 +18,10 @@ // INCLUDE FILES -#include "PSetCallDivertingBasicImpl.h" -#include "PSetCallDivertingDualAffectImpl.h" -#include "PSetCallDivertingCreator.h" -#include "PsetVariationProxy.h" +#include "psetcalldivertingbasicimpl.h" +#include "psetcalldivertingdualaffectimpl.h" +#include "psetcalldivertingcreator.h" +#include "psetvariationproxy.h" #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PSetCallDivertingDualAffectImpl.cpp --- a/cellular/telephonysettings/src/PSetCallDivertingDualAffectImpl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PSetCallDivertingDualAffectImpl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,15 +17,12 @@ // INCLUDE FILES -#include "PSetCallDivertingDualAffectImpl.h" -#include "PSetSubscriberIdCheck.h" +#include "psetcalldivertingdualaffectimpl.h" +#include "psetsubscriberidcheck.h" #include #include #include -// <-- QT PHONE START --> -//#include -// <-- QT PHONE END --> #include #include #include @@ -34,11 +31,11 @@ #include "psetcalldiverting.h" #include "psetcontainer.h" #include "mpsetdivertobs.h" -#include "PsetTelephony.h" -#include "PSetPanic.h" +#include "psettelephony.h" +#include "psetpanic.h" #include "mpsetrequestobs.h" -#include "PSetUtility.h" -#include "PhoneSettingsLogger.h" +#include "psetutility.h" +#include "phonesettingslogger.h" #include "psetsaobserver.h" // LOCAL CONSTANTS AND MACROS diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PSetRefreshHandlerImpl.cpp --- a/cellular/telephonysettings/src/PSetRefreshHandlerImpl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PSetRefreshHandlerImpl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,12 +18,12 @@ // INCLUDE FILES -#include "PSetRefreshHandlerImpl.h" +#include "psetrefreshhandlerimpl.h" #include #include #include #include -#include "PhoneSettingsLogger.h" +#include "phonesettingslogger.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PSetSubscriberIdCheck.cpp --- a/cellular/telephonysettings/src/PSetSubscriberIdCheck.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PSetSubscriberIdCheck.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include "PSetSubscriberIdCheck.h" +#include "psetsubscriberidcheck.h" _LIT( KRogersImsi, "30272" ); const TInt KMinImsiLength = 5; diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PSetUtility.cpp --- a/cellular/telephonysettings/src/PSetUtility.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PSetUtility.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include "PSetUtility.h" +#include "psetutility.h" #include -#include "PhoneSettingsLogger.h" +#include "phonesettingslogger.h" // ============================ MEMBER FUNCTIONS =============================== @@ -311,7 +311,6 @@ } } -// <-- QT PHONE START --> // --------------------------------------------------------------------------- // // Returns divert reason @@ -342,7 +341,6 @@ return EDivertConditionNotReachable; } } -// <-- QT PHONE END --> // --------------------------------------------------------------------------- // Verify that ALS is really used. diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetCSP.cpp --- a/cellular/telephonysettings/src/PsetCSP.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetCSP.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ //INCLUDE FILES #include "psetcsp.h" #include -#include "PhoneSettingsLogger.h" +#include "phonesettingslogger.h" // MEMBER FUNCTIONS // --------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetCallBarring.cpp --- a/cellular/telephonysettings/src/PsetCallBarring.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetCallBarring.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,11 +22,11 @@ #include #include "mpsetrequestobs.h" #include "psetcallbarring.h" -#include "PsetTelephony.h" -#include "PSetPanic.h" +#include "psettelephony.h" +#include "psetpanic.h" #include "psetconstants.h" -#include "PSetUtility.h" -#include "PhoneSettingsLogger.h" +#include "psetutility.h" +#include "phonesettingslogger.h" // CONSTANTS _LIT( KPSNameOfClass, "CPsetCallBarring" ); diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetCallDiverting.cpp --- a/cellular/telephonysettings/src/PsetCallDiverting.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetCallDiverting.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,21 +22,18 @@ #include #include #include -// <-- QT PHONE START --> -//#include -// <-- QT PHONE END--> #include #include #include "psetcalldiverting.h" #include "psetcontainer.h" #include "mpsetdivertobs.h" -#include "PsetTelephony.h" -#include "PSetPanic.h" -#include "PhoneSettingsLogger.h" +#include "psettelephony.h" +#include "psetpanic.h" +#include "phonesettingslogger.h" -#include "PSetCallDivertingCreator.h" -#include "MCallDiverting.h" +#include "psetcalldivertingcreator.h" +#include "mcalldiverting.h" // MEMBER FUNCTIONS // --------------------------------------------------------------------------- @@ -262,9 +259,7 @@ EXPORT_C void CPsetCallDiverting::SetRequestObserver( MPsetRequestObserver* aObs ) { iReqObserver = aObs; -// <-- QT PHONE START --> iDivert->SetRequestObserver(aObs); -// <-- QT PHONE END --> } // --------------------------------------------------------------------------- @@ -274,30 +269,6 @@ EXPORT_C void CPsetCallDiverting::VoiceMailQueryL( TDes& /*aTelNumber*/ ) { __PHSLOGSTRING("[PHS]--> CPsetCallDiverting::VoiceMailQueryL" ); -// <-- QT PHONE START --> -/* - RVmbxNumber vmbxConnection; - TBool vmbxNrChanged = ETrue; - TInt retValue = iDivert->OpenVmbxLC( aTelNumber, vmbxConnection ); - __PHSLOGSTRING1("[PHS] CPsetCallDiverting::VoiceMailQueryL: aTelNumber = %S", &aTelNumber ); - __PHSLOGSTRING1("[PHS] CPsetCallDiverting::VoiceMailQueryL: retValue = %d", retValue ); - - if ( retValue == KErrNotFound ) - { - vmbxNrChanged = vmbxConnection.QueryNumberL( EVmbxNotDefinedQuery, aTelNumber ); - } - else if ( retValue != KErrNone ) - { - //Problem with vmbx application, better leave. - User::Leave( retValue ); - } - if ( !vmbxNrChanged ) - { - User::Leave( KErrCancel ); - } - CleanupStack::PopAndDestroy(); // vmbxConnection - */ -// <-- QT PHONE END--> __PHSLOGSTRING("[PHS] <--CPsetCallDiverting::VoiceMailQueryL" ); } @@ -309,30 +280,6 @@ EXPORT_C void CPsetCallDiverting::VideoMailQueryL( TDes& /*aTelNumber*/ ) { __PHSLOGSTRING("[PHS]--> CPsetCallDiverting::VideoMailQueryL" ); - // <-- QT PHONE START --> - /* - RVmbxNumber vmbxConnection; - TBool vmbxNrChanged = ETrue; - TInt retValue = OpenVideoMailboxLC( aTelNumber, vmbxConnection ); - __PHSLOGSTRING1("[PHS] CPsetCallDiverting::VideoMailQueryL: aTelNumber = %S", &aTelNumber ); - __PHSLOGSTRING1("[PHS] CPsetCallDiverting::VideoMailQueryL: retValue = %d", retValue ); - - if ( retValue == KErrNotFound ) - { - vmbxNrChanged = vmbxConnection.QueryVideoMbxNumberL( EVmbxNotDefinedQuery, aTelNumber ); - } - else if ( retValue != KErrNone ) - { - //Problem with vmbx application, better leave. - User::Leave( retValue ); - } - if ( !vmbxNrChanged ) - { - User::Leave( KErrCancel ); - } - CleanupStack::PopAndDestroy(); // vmbxConnection - */ - // <-- QT PHONE END--> __PHSLOGSTRING("[PHS] <--CPsetCallDiverting::VideoMailQueryL" ); } @@ -341,18 +288,9 @@ // Opens Vmbx. Leaves vmbx to the stack. // --------------------------------------------------------------------------- // -// <-- QT PHONE START --> TInt CPsetCallDiverting::OpenVideoMailboxLC( TDes& /*aTelNumber*/, RVmbxNumber& /*aVmbx*/ ) { -/* - __PHSLOGSTRING("[PHS]--> CPsetCallDiverting::OpenVideoMailboxLC" ); - User::LeaveIfError( aVmbx.Open( iPhone ) ); - CleanupClosePushL( aVmbx ); - __PHSLOGSTRING("[PHS]<-- CPsetCallDiverting::OpenVideoMailboxLC" ); - return aVmbx.GetVideoMbxNumber( aTelNumber ); -*/ return 0; -// <-- QT PHONE END --> } // End of File diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetCallWaiting.cpp --- a/cellular/telephonysettings/src/PsetCallWaiting.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetCallWaiting.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,13 +21,13 @@ #include "psetcallwaiting.h" #include "mpsetcallwaitingobs.h" #include "nwdefs.h" -#include "PSetPanic.h" +#include "psetpanic.h" #include "psetconstants.h" #include "mpsetrequestobs.h" -#include "PSetUtility.h" -#include "PhoneSettingsLogger.h" +#include "psetutility.h" +#include "phonesettingslogger.h" -#include "PsetVariationProxy.h" +#include "psetvariationproxy.h" #include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetCli.cpp --- a/cellular/telephonysettings/src/PsetCli.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetCli.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ //INCLUDE FILES #include "psetcli.h" -#include "PSetPanic.h" +#include "psetpanic.h" #include "psetconstants.h" #include "mpsetrequestobs.h" #include diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetContainer.cpp --- a/cellular/telephonysettings/src/PsetContainer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetContainer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include "psetcontainer.h" #include "psetconstants.h" -#include "PSetRefreshHandlerImpl.h" +#include "psetrefreshhandlerimpl.h" #include // --------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetNetwork.cpp --- a/cellular/telephonysettings/src/PsetNetwork.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetNetwork.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #include "mpsetnetworkinfoobs.h" #include "psetnetwork.h" #include "psetsaobserver.h" -#include "PSetPanic.h" +#include "psetpanic.h" #include "psetconstants.h" #include "mpsetnetworkselect.h" #include @@ -29,7 +29,7 @@ #include #include -#include "PhoneSettingsLogger.h" +#include "phonesettingslogger.h" // LOCAL CONSTANTS AND MACROS _LIT( KPSNameOfClass, "CPsetNetwork" ); diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetSAObserver.cpp --- a/cellular/telephonysettings/src/PsetSAObserver.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetSAObserver.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -26,9 +26,9 @@ #include "psetsaobserver.h" #include "mpsetnetworkinfoobs.h" #include "mpsetdivertobs.h" -#include "PhoneSettingsLogger.h" -#include "PSetUtility.h" -#include "PsetVariationProxy.h" +#include "phonesettingslogger.h" +#include "psetutility.h" +#include "psetvariationproxy.h" //CONSTANTS const TInt KPsetRequesterUncertain = 0; diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetTelephony.cpp --- a/cellular/telephonysettings/src/PsetTelephony.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetTelephony.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ #include #include #include "psetconstants.h" -#include "PsetTelephony.h" -#include "PhoneSettingsLogger.h" +#include "psettelephony.h" +#include "phonesettingslogger.h" // MEMBER FUNCTIONS // --------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/src/PsetVariationProxy.cpp --- a/cellular/telephonysettings/src/PsetVariationProxy.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/src/PsetVariationProxy.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ */ -#include "PsetVariationProxy.h" +#include "psetvariationproxy.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallDivertingObserver.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallDivertingObserver.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallDivertingObserver.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define PHONESETTINGSTESTCALLDIVERTINGGOBSERVER_H #include -#include +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallWaitingObserver.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallWaitingObserver.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallWaitingObserver.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define PHONESETTINGSTESTCALLWAITINGGOBSERVER_H #include -#include +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCliObserver.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCliObserver.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCliObserver.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define PHONESETTINGSTESTCLIOBSERVER_H #include -#include +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkInfoObserver.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkInfoObserver.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkInfoObserver.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define PHONESETTINGSTESTNETWORKINFOOBSERVER_H #include -#include +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkModeObserver.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkModeObserver.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkModeObserver.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define PHONESETTINGSTESTNETWORKMODEOBSERVER_H #include -#include +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestParser.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestParser.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestParser.h Fri Apr 16 15:31:58 2010 +0300 @@ -25,10 +25,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "PhoneSettingsTest.hrh" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestPsetRequestObserver.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestPsetRequestObserver.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestPsetRequestObserver.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define PHONESETTINGSTESTPSETREQUESTOBSERVER_H #include -#include +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestRefreshHandler.h --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestRefreshHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestRefreshHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define PHONESETTINGSTESTREFRESHHANDLER_H #include -#include +#include #include "PhoneSettingsTestParser.h" // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestCSP.cpp --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestCSP.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestCSP.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "PhoneSettingsTest.hrh" #include "PhoneSettingsTest.h" #include "MPhoneSettingsTestMessageHandler.h" diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetwork.cpp --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetwork.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetwork.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -32,7 +32,7 @@ #include "PhoneSettingsTestPsetRequestObserver.h" #include "PhoneSettingsTestNetworkInfoObserver.h" #include "PhoneSettingsTestNetworkModeObserver.h" -#include "PsetSAObserver.h" +#include "psetsaobserver.h" #include "PhoneSettingsTestNetwork.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkInfoObserver.cpp --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkInfoObserver.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkInfoObserver.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "PhoneSettingsTestNetworkInfoObserver.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkModeObserver.cpp --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkModeObserver.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkModeObserver.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include +#include #include "PhoneSettingsTestNetworkModeObserver.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestParser.cpp --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include -#include +#include #include "MPhoneSettingsTestMessageHandler.h" #include "PhoneSettingsTestParser.h" diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestSAObserver.cpp --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestSAObserver.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestSAObserver.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "PhoneSettingsTest.hrh" #include "MPhoneSettingsTestMessageHandler.h" #include "PhoneSettingsTestUtilities.h" diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestUtilities.cpp --- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestUtilities.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestUtilities.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include -#include "PSetConstants.h" +#include "psetconstants.h" #include "PhoneSettingsTestUtilities.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/bwins/psetwrapperu.def --- a/cellular/telephonysettings/xqbindings/bwins/psetwrapperu.def Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/bwins/psetwrapperu.def Fri Apr 16 15:31:58 2010 +0300 @@ -1,109 +1,128 @@ EXPORTS - ?getAvailableNetworks@PSetNetworkWrapper@@QAEXXZ @ 1 NONAME ; void PSetNetworkWrapper::getAvailableNetworks(void) - ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0@Z @ 2 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *) - ?getStaticMetaObject@PSetWrapper@@SAABUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const & PSetWrapper::getStaticMetaObject(void) - ?staticMetaObject@PSetCallWaitingWrapper@@2UQMetaObject@@B @ 4 NONAME ; struct QMetaObject const PSetCallWaitingWrapper::staticMetaObject - ?staticMetaObject@PSetWrapper@@2UQMetaObject@@B @ 5 NONAME ; struct QMetaObject const PSetWrapper::staticMetaObject - ??_EPSetWrapper@@UAE@I@Z @ 6 NONAME ; PSetWrapper::~PSetWrapper(unsigned int) - ?trUtf8@PSetCallWaitingWrapper@@SA?AVQString@@PBD0@Z @ 7 NONAME ; class QString PSetCallWaitingWrapper::trUtf8(char const *, char const *) - ?validateDivertNumber@PSetCallDivertingWrapper@@ABEHABVTDesC16@@@Z @ 8 NONAME ; int PSetCallDivertingWrapper::validateDivertNumber(class TDesC16 const &) const - ?qt_metacast@PSetNetworkWrapper@@UAEPAXPBD@Z @ 9 NONAME ; void * PSetNetworkWrapper::qt_metacast(char const *) - ?metaObject@PSetWrapper@@UBEPBUQMetaObject@@XZ @ 10 NONAME ; struct QMetaObject const * PSetWrapper::metaObject(void) const - ?callDivertingWrapper@PSetWrapper@@QAEAAVPSetCallDivertingWrapper@@XZ @ 11 NONAME ; class PSetCallDivertingWrapper & PSetWrapper::callDivertingWrapper(void) - ?getDefaultNumbers@PSetCallDivertingWrapper@@QAEXAAVQStringList@@@Z @ 12 NONAME ; void PSetCallDivertingWrapper::getDefaultNumbers(class QStringList &) - ?getVoiceMailBoxNumber@PSetCallDivertingWrapper@@QAEXAAVQString@@@Z @ 13 NONAME ; void PSetCallDivertingWrapper::getVoiceMailBoxNumber(class QString &) - ?getCallWaitingStatus@PSetCallWaitingWrapper@@QAEXXZ @ 14 NONAME ; void PSetCallWaitingWrapper::getCallWaitingStatus(void) - ?tr@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 15 NONAME ; class QString PSetCliWrapper::tr(char const *, char const *) - ?cliInformation@PSetCliWrapper@@IAEXABW4PsCallLineIdentity@@@Z @ 16 NONAME ; void PSetCliWrapper::cliInformation(enum PsCallLineIdentity const &) - ?handleDivertingError@PSetCallDivertingWrapper@@IAEXH@Z @ 17 NONAME ; void PSetCallDivertingWrapper::handleDivertingError(int) - ?tr@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 18 NONAME ; class QString PSetWrapper::tr(char const *, char const *, int) - ?staticMetaObject@PSetCliWrapper@@2UQMetaObject@@B @ 19 NONAME ; struct QMetaObject const PSetCliWrapper::staticMetaObject - ?cancelRequest@PSetNetworkWrapper@@QAEXXZ @ 20 NONAME ; void PSetNetworkWrapper::cancelRequest(void) - ?getClipMode@PSetCliWrapper@@QAEXXZ @ 21 NONAME ; void PSetCliWrapper::getClipMode(void) - ??0PSetCallDivertingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 22 NONAME ; PSetCallDivertingWrapper::PSetCallDivertingWrapper(class CPsetContainer &, class QObject *) - ?metaObject@PSetCliWrapper@@UBEPBUQMetaObject@@XZ @ 23 NONAME ; struct QMetaObject const * PSetCliWrapper::metaObject(void) const - ?tr@PSetCallWaitingWrapper@@SA?AVQString@@PBD0@Z @ 24 NONAME ; class QString PSetCallWaitingWrapper::tr(char const *, char const *) - ?qt_metacast@PSetCallDivertingWrapper@@UAEPAXPBD@Z @ 25 NONAME ; void * PSetCallDivertingWrapper::qt_metacast(char const *) - ?getNetworkAccessMode@PSetNetworkWrapper@@QBEXXZ @ 26 NONAME ; void PSetNetworkWrapper::getNetworkAccessMode(void) const - ??1PSetCallWaitingWrapper@@UAE@XZ @ 27 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(void) - ?callWaitingWrapper@PSetWrapper@@QAEAAVPSetCallWaitingWrapper@@XZ @ 28 NONAME ; class PSetCallWaitingWrapper & PSetWrapper::callWaitingWrapper(void) - ?handleCnapStatus@PSetCliWrapper@@IAEXH@Z @ 29 NONAME ; void PSetCliWrapper::handleCnapStatus(int) - ?availableNetworksGot@PSetNetworkWrapper@@IAEXAAV?$QList@PAUNetworkInfo@PSetNetworkWrapper@@@@@Z @ 30 NONAME ; void PSetNetworkWrapper::availableNetworksGot(class QList &) - ?handleCallWaitingChanged@PSetCallWaitingWrapper@@IAEXW4PsCallWaitingCommand@1@H@Z @ 31 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingChanged(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) - ?metaObject@PSetCallDivertingWrapper@@UBEPBUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const * PSetCallDivertingWrapper::metaObject(void) const - ?cancelProcess@PSetCallDivertingWrapper@@QAEXXZ @ 33 NONAME ; void PSetCallDivertingWrapper::cancelProcess(void) - ?networkWrapper@PSetWrapper@@QAEAAVPSetNetworkWrapper@@XZ @ 34 NONAME ; class PSetNetworkWrapper & PSetWrapper::networkWrapper(void) - ?getColpMode@PSetCliWrapper@@QAEXXZ @ 35 NONAME ; void PSetCliWrapper::getColpMode(void) - ?requestingSelectedNetwork@PSetNetworkWrapper@@IAEX_N@Z @ 36 NONAME ; void PSetNetworkWrapper::requestingSelectedNetwork(bool) - ?qt_metacall@PSetNetworkWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 37 NONAME ; int PSetNetworkWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?handleDivertingChanged@PSetCallDivertingWrapper@@IAEXABVPSCallDivertingCommand@@_N@Z @ 38 NONAME ; void PSetCallDivertingWrapper::handleDivertingChanged(class PSCallDivertingCommand const &, bool) - ?trUtf8@PSetCallWaitingWrapper@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString PSetCallWaitingWrapper::trUtf8(char const *, char const *, int) - ?networkChanged@PSetNetworkWrapper@@IAEXAAUNetworkInfo@1@AAW4RegistrationStatus@1@@Z @ 40 NONAME ; void PSetNetworkWrapper::networkChanged(struct PSetNetworkWrapper::NetworkInfo &, enum PSetNetworkWrapper::RegistrationStatus &) - ?cliWrapper@PSetWrapper@@QAEAAVPSetCliWrapper@@XZ @ 41 NONAME ; class PSetCliWrapper & PSetWrapper::cliWrapper(void) - ?handleCliStatus@PSetCliWrapper@@IAEXPAEHABW4PsCallLineIdentity@@@Z @ 42 NONAME ; void PSetCliWrapper::handleCliStatus(unsigned char *, int, enum PsCallLineIdentity const &) - ?qt_metacall@PSetCallDivertingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 43 NONAME ; int PSetCallDivertingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?trUtf8@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 44 NONAME ; class QString PSetCallDivertingWrapper::trUtf8(char const *, char const *, int) - ?getNetworkSelectionMode@PSetNetworkWrapper@@QBE?AW4ErrorCode@1@AAW4NetworkSelectionMode@1@@Z @ 45 NONAME ; enum PSetNetworkWrapper::ErrorCode PSetNetworkWrapper::getNetworkSelectionMode(enum PSetNetworkWrapper::NetworkSelectionMode &) const - ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 46 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *) - ?qt_metacast@PSetCliWrapper@@UAEPAXPBD@Z @ 47 NONAME ; void * PSetCliWrapper::qt_metacast(char const *) - ?staticMetaObject@PSetCallDivertingWrapper@@2UQMetaObject@@B @ 48 NONAME ; struct QMetaObject const PSetCallDivertingWrapper::staticMetaObject - ??0PSetCliWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 49 NONAME ; PSetCliWrapper::PSetCliWrapper(class CPsetContainer &, class QObject *) - ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 50 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *) - ??0PSetNetworkWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 51 NONAME ; PSetNetworkWrapper::PSetNetworkWrapper(class CPsetContainer &, class QObject *) - ?qt_metacall@PSetCallWaitingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 52 NONAME ; int PSetCallWaitingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?networkAccessModeGot@PSetNetworkWrapper@@IAEXH@Z @ 53 NONAME ; void PSetNetworkWrapper::networkAccessModeGot(int) - ?searchingNetworks@PSetNetworkWrapper@@IAEXAAW4RequestType@1@@Z @ 54 NONAME ; void PSetNetworkWrapper::searchingNetworks(enum PSetNetworkWrapper::RequestType &) - ?trUtf8@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 55 NONAME ; class QString PSetNetworkWrapper::trUtf8(char const *, char const *) - ?getClirMode@PSetCliWrapper@@QAEXXZ @ 56 NONAME ; void PSetCliWrapper::getClirMode(void) - ?getStaticMetaObject@PSetCliWrapper@@SAABUQMetaObject@@XZ @ 57 NONAME ; struct QMetaObject const & PSetCliWrapper::getStaticMetaObject(void) - ?handleDivertingStatus@PSetCallDivertingWrapper@@IAEXAAV?$QList@PAVPSCallDivertingStatus@@@@_N@Z @ 58 NONAME ; void PSetCallDivertingWrapper::handleDivertingStatus(class QList &, bool) - ??1PSetCallDivertingWrapper@@UAE@XZ @ 59 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(void) - ?selectNetwork@PSetNetworkWrapper@@QAEXABUNetworkInfo@1@@Z @ 60 NONAME ; void PSetNetworkWrapper::selectNetwork(struct PSetNetworkWrapper::NetworkInfo const &) - ?qt_metacall@PSetWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 61 NONAME ; int PSetWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?trUtf8@PSetNetworkWrapper@@SA?AVQString@@PBD0H@Z @ 62 NONAME ; class QString PSetNetworkWrapper::trUtf8(char const *, char const *, int) - ?trUtf8@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 63 NONAME ; class QString PSetCallDivertingWrapper::trUtf8(char const *, char const *) - ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 64 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *, int) - ?handleCliRequesting@PSetCliWrapper@@IAEX_N0@Z @ 65 NONAME ; void PSetCliWrapper::handleCliRequesting(bool, bool) - ?handleCallWaitingError@PSetCallWaitingWrapper@@IAEXH@Z @ 66 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingError(int) - ?getStaticMetaObject@PSetCallWaitingWrapper@@SAABUQMetaObject@@XZ @ 67 NONAME ; struct QMetaObject const & PSetCallWaitingWrapper::getStaticMetaObject(void) - ?metaObject@PSetCallWaitingWrapper@@UBEPBUQMetaObject@@XZ @ 68 NONAME ; struct QMetaObject const * PSetCallWaitingWrapper::metaObject(void) const - ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 69 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *, int) - ?getCallDivertingStatus@PSetCallDivertingWrapper@@QAEXV?$QFlags@W4PsService@@@@W4PsCallDivertingCondition@@H@Z @ 70 NONAME ; void PSetCallDivertingWrapper::getCallDivertingStatus(class QFlags, enum PsCallDivertingCondition, int) - ?tr@PSetWrapper@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString PSetWrapper::tr(char const *, char const *) - ?setNetworkAccessMode@PSetNetworkWrapper@@QAEXW4NetworkAccessMode@1@@Z @ 72 NONAME ; void PSetNetworkWrapper::setNetworkAccessMode(enum PSetNetworkWrapper::NetworkAccessMode) - ?setCallDiverting@PSetCallDivertingWrapper@@QAEHAAVPSCallDivertingCommand@@H@Z @ 73 NONAME ; int PSetCallDivertingWrapper::setCallDiverting(class PSCallDivertingCommand &, int) - ??1PSetCliWrapper@@UAE@XZ @ 74 NONAME ; PSetCliWrapper::~PSetCliWrapper(void) - ?getColrMode@PSetCliWrapper@@QAEXXZ @ 75 NONAME ; void PSetCliWrapper::getColrMode(void) - ??0PSetWrapper@@QAE@PAVQObject@@@Z @ 76 NONAME ; PSetWrapper::PSetWrapper(class QObject *) - ?qt_metacall@PSetCliWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int PSetCliWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?handleCallWaitingRequesting@PSetCallWaitingWrapper@@IAEX_N0@Z @ 78 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingRequesting(bool, bool) - ?handleCliError@PSetCliWrapper@@IAEXH@Z @ 79 NONAME ; void PSetCliWrapper::handleCliError(int) - ?cancelAll@PSetCliWrapper@@QAEXXZ @ 80 NONAME ; void PSetCliWrapper::cancelAll(void) - ??1PSetWrapper@@UAE@XZ @ 81 NONAME ; PSetWrapper::~PSetWrapper(void) - ?handleCFRequesting@PSetCallDivertingWrapper@@IAEX_N0@Z @ 82 NONAME ; void PSetCallDivertingWrapper::handleCFRequesting(bool, bool) - ?networkReqestFailed@PSetNetworkWrapper@@IAEXW4ErrorCode@1@W4RequestType@1@@Z @ 83 NONAME ; void PSetNetworkWrapper::networkReqestFailed(enum PSetNetworkWrapper::ErrorCode, enum PSetNetworkWrapper::RequestType) - ?cancelProcess@PSetCallWaitingWrapper@@QAEXXZ @ 84 NONAME ; void PSetCallWaitingWrapper::cancelProcess(void) - ?setNewDefaultNumber@PSetCallDivertingWrapper@@QAEXVQString@@@Z @ 85 NONAME ; void PSetCallDivertingWrapper::setNewDefaultNumber(class QString) - ?findPlus@PSetCallDivertingWrapper@@ABE_NABVTDesC16@@@Z @ 86 NONAME ; bool PSetCallDivertingWrapper::findPlus(class TDesC16 const &) const - ??_EPSetNetworkWrapper@@UAE@I@Z @ 87 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(unsigned int) - ??_EPSetCallDivertingWrapper@@UAE@I@Z @ 88 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(unsigned int) - ?setCallWaiting@PSetCallWaitingWrapper@@QAEXW4PsCallWaitingCommand@1@H@Z @ 89 NONAME ; void PSetCallWaitingWrapper::setCallWaiting(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) - ??_EPSetCliWrapper@@UAE@I@Z @ 90 NONAME ; PSetCliWrapper::~PSetCliWrapper(unsigned int) - ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0H@Z @ 91 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *, int) - ?handleCallWaitingGetStatus@PSetCallWaitingWrapper@@IAEXW4PsCallWaitingStatus@1@ABV?$QList@E@@@Z @ 92 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingGetStatus(enum PSetCallWaitingWrapper::PsCallWaitingStatus, class QList const &) - ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 93 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *) - ?requestDone@PSetCallDivertingWrapper@@IAEXXZ @ 94 NONAME ; void PSetCallDivertingWrapper::requestDone(void) - ?qt_metacast@PSetWrapper@@UAEPAXPBD@Z @ 95 NONAME ; void * PSetWrapper::qt_metacast(char const *) - ?getCnap@PSetCliWrapper@@QAEXXZ @ 96 NONAME ; void PSetCliWrapper::getCnap(void) - ?tr@PSetCliWrapper@@SA?AVQString@@PBD0H@Z @ 97 NONAME ; class QString PSetCliWrapper::tr(char const *, char const *, int) - ?getStaticMetaObject@PSetCallDivertingWrapper@@SAABUQMetaObject@@XZ @ 98 NONAME ; struct QMetaObject const & PSetCallDivertingWrapper::getStaticMetaObject(void) - ?metaObject@PSetNetworkWrapper@@UBEPBUQMetaObject@@XZ @ 99 NONAME ; struct QMetaObject const * PSetNetworkWrapper::metaObject(void) const - ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0H@Z @ 100 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *, int) - ?staticMetaObject@PSetNetworkWrapper@@2UQMetaObject@@B @ 101 NONAME ; struct QMetaObject const PSetNetworkWrapper::staticMetaObject - ?qt_metacast@PSetCallWaitingWrapper@@UAEPAXPBD@Z @ 102 NONAME ; void * PSetCallWaitingWrapper::qt_metacast(char const *) - ??1PSetNetworkWrapper@@UAE@XZ @ 103 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(void) - ?tr@PSetCallWaitingWrapper@@SA?AVQString@@PBD0H@Z @ 104 NONAME ; class QString PSetCallWaitingWrapper::tr(char const *, char const *, int) - ??0PSetCallWaitingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 105 NONAME ; PSetCallWaitingWrapper::PSetCallWaitingWrapper(class CPsetContainer &, class QObject *) - ??_EPSetCallWaitingWrapper@@UAE@I@Z @ 106 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(unsigned int) - ?getStaticMetaObject@PSetNetworkWrapper@@SAABUQMetaObject@@XZ @ 107 NONAME ; struct QMetaObject const & PSetNetworkWrapper::getStaticMetaObject(void) + ?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) diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/eabi/psetwrapperu.def --- a/cellular/telephonysettings/xqbindings/eabi/psetwrapperu.def Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/eabi/psetwrapperu.def Fri Apr 16 15:31:58 2010 +0300 @@ -4,106 +4,125 @@ _ZN11PSetWrapper11qt_metacastEPKc @ 3 NONAME _ZN11PSetWrapper14networkWrapperEv @ 4 NONAME _ZN11PSetWrapper16staticMetaObjectE @ 5 NONAME DATA 16 - _ZN11PSetWrapper18callWaitingWrapperEv @ 6 NONAME - _ZN11PSetWrapper19getStaticMetaObjectEv @ 7 NONAME - _ZN11PSetWrapper20callDivertingWrapperEv @ 8 NONAME - _ZN11PSetWrapperC1EP7QObject @ 9 NONAME - _ZN11PSetWrapperC2EP7QObject @ 10 NONAME - _ZN11PSetWrapperD0Ev @ 11 NONAME - _ZN11PSetWrapperD1Ev @ 12 NONAME - _ZN11PSetWrapperD2Ev @ 13 NONAME - _ZN14PSetCliWrapper11getClipModeEv @ 14 NONAME - _ZN14PSetCliWrapper11getClirModeEv @ 15 NONAME - _ZN14PSetCliWrapper11getColpModeEv @ 16 NONAME - _ZN14PSetCliWrapper11getColrModeEv @ 17 NONAME - _ZN14PSetCliWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 18 NONAME - _ZN14PSetCliWrapper11qt_metacastEPKc @ 19 NONAME - _ZN14PSetCliWrapper14cliInformationERK18PsCallLineIdentity @ 20 NONAME - _ZN14PSetCliWrapper14handleCliErrorEi @ 21 NONAME - _ZN14PSetCliWrapper15handleCliStatusEPhiRK18PsCallLineIdentity @ 22 NONAME - _ZN14PSetCliWrapper16handleCnapStatusEi @ 23 NONAME - _ZN14PSetCliWrapper16staticMetaObjectE @ 24 NONAME DATA 16 - _ZN14PSetCliWrapper19getStaticMetaObjectEv @ 25 NONAME - _ZN14PSetCliWrapper19handleCliRequestingEbb @ 26 NONAME - _ZN14PSetCliWrapper7getCnapEv @ 27 NONAME - _ZN14PSetCliWrapper9cancelAllEv @ 28 NONAME - _ZN14PSetCliWrapperC1ER14CPsetContainerP7QObject @ 29 NONAME - _ZN14PSetCliWrapperC2ER14CPsetContainerP7QObject @ 30 NONAME - _ZN14PSetCliWrapperD0Ev @ 31 NONAME - _ZN14PSetCliWrapperD1Ev @ 32 NONAME - _ZN14PSetCliWrapperD2Ev @ 33 NONAME - _ZN18PSetNetworkWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 34 NONAME - _ZN18PSetNetworkWrapper11qt_metacastEPKc @ 35 NONAME - _ZN18PSetNetworkWrapper13cancelRequestEv @ 36 NONAME - _ZN18PSetNetworkWrapper13selectNetworkERKNS_11NetworkInfoE @ 37 NONAME - _ZN18PSetNetworkWrapper14networkChangedERNS_11NetworkInfoERNS_18RegistrationStatusE @ 38 NONAME - _ZN18PSetNetworkWrapper16staticMetaObjectE @ 39 NONAME DATA 16 - _ZN18PSetNetworkWrapper17searchingNetworksERNS_11RequestTypeE @ 40 NONAME - _ZN18PSetNetworkWrapper19getStaticMetaObjectEv @ 41 NONAME - _ZN18PSetNetworkWrapper19networkReqestFailedENS_9ErrorCodeENS_11RequestTypeE @ 42 NONAME - _ZN18PSetNetworkWrapper20availableNetworksGotER5QListIPNS_11NetworkInfoEE @ 43 NONAME - _ZN18PSetNetworkWrapper20getAvailableNetworksEv @ 44 NONAME - _ZN18PSetNetworkWrapper20networkAccessModeGotEi @ 45 NONAME - _ZN18PSetNetworkWrapper20setNetworkAccessModeENS_17NetworkAccessModeE @ 46 NONAME - _ZN18PSetNetworkWrapper25requestingSelectedNetworkEb @ 47 NONAME - _ZN18PSetNetworkWrapperC1ER14CPsetContainerP7QObject @ 48 NONAME - _ZN18PSetNetworkWrapperC2ER14CPsetContainerP7QObject @ 49 NONAME - _ZN18PSetNetworkWrapperD0Ev @ 50 NONAME - _ZN18PSetNetworkWrapperD1Ev @ 51 NONAME - _ZN18PSetNetworkWrapperD2Ev @ 52 NONAME - _ZN22PSetCallWaitingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 53 NONAME - _ZN22PSetCallWaitingWrapper11qt_metacastEPKc @ 54 NONAME - _ZN22PSetCallWaitingWrapper13cancelProcessEv @ 55 NONAME - _ZN22PSetCallWaitingWrapper14setCallWaitingENS_20PsCallWaitingCommandEi @ 56 NONAME - _ZN22PSetCallWaitingWrapper16staticMetaObjectE @ 57 NONAME DATA 16 - _ZN22PSetCallWaitingWrapper19getStaticMetaObjectEv @ 58 NONAME - _ZN22PSetCallWaitingWrapper20getCallWaitingStatusEv @ 59 NONAME - _ZN22PSetCallWaitingWrapper22handleCallWaitingErrorEi @ 60 NONAME - _ZN22PSetCallWaitingWrapper24handleCallWaitingChangedENS_20PsCallWaitingCommandEi @ 61 NONAME - _ZN22PSetCallWaitingWrapper26handleCallWaitingGetStatusENS_19PsCallWaitingStatusERK5QListIhE @ 62 NONAME - _ZN22PSetCallWaitingWrapper27handleCallWaitingRequestingEbb @ 63 NONAME - _ZN22PSetCallWaitingWrapperC1ER14CPsetContainerP7QObject @ 64 NONAME - _ZN22PSetCallWaitingWrapperC2ER14CPsetContainerP7QObject @ 65 NONAME - _ZN22PSetCallWaitingWrapperD0Ev @ 66 NONAME - _ZN22PSetCallWaitingWrapperD1Ev @ 67 NONAME - _ZN22PSetCallWaitingWrapperD2Ev @ 68 NONAME - _ZN24PSetCallDivertingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 69 NONAME - _ZN24PSetCallDivertingWrapper11qt_metacastEPKc @ 70 NONAME - _ZN24PSetCallDivertingWrapper11requestDoneEv @ 71 NONAME - _ZN24PSetCallDivertingWrapper13cancelProcessEv @ 72 NONAME - _ZN24PSetCallDivertingWrapper16setCallDivertingER22PSCallDivertingCommandi @ 73 NONAME - _ZN24PSetCallDivertingWrapper16staticMetaObjectE @ 74 NONAME DATA 16 - _ZN24PSetCallDivertingWrapper17getDefaultNumbersER11QStringList @ 75 NONAME - _ZN24PSetCallDivertingWrapper18handleCFRequestingEbb @ 76 NONAME - _ZN24PSetCallDivertingWrapper19getStaticMetaObjectEv @ 77 NONAME - _ZN24PSetCallDivertingWrapper19setNewDefaultNumberE7QString @ 78 NONAME - _ZN24PSetCallDivertingWrapper20handleDivertingErrorEi @ 79 NONAME - _ZN24PSetCallDivertingWrapper21getVoiceMailBoxNumberER7QString @ 80 NONAME - _ZN24PSetCallDivertingWrapper21handleDivertingStatusER5QListIP21PSCallDivertingStatusEb @ 81 NONAME - _ZN24PSetCallDivertingWrapper22getCallDivertingStatusE6QFlagsI9PsServiceE24PsCallDivertingConditioni @ 82 NONAME - _ZN24PSetCallDivertingWrapper22handleDivertingChangedERK22PSCallDivertingCommandb @ 83 NONAME - _ZN24PSetCallDivertingWrapperC1ER14CPsetContainerP7QObject @ 84 NONAME - _ZN24PSetCallDivertingWrapperC2ER14CPsetContainerP7QObject @ 85 NONAME - _ZN24PSetCallDivertingWrapperD0Ev @ 86 NONAME - _ZN24PSetCallDivertingWrapperD1Ev @ 87 NONAME - _ZN24PSetCallDivertingWrapperD2Ev @ 88 NONAME - _ZNK11PSetWrapper10metaObjectEv @ 89 NONAME - _ZNK14PSetCliWrapper10metaObjectEv @ 90 NONAME - _ZNK18PSetNetworkWrapper10metaObjectEv @ 91 NONAME - _ZNK18PSetNetworkWrapper20getNetworkAccessModeEv @ 92 NONAME - _ZNK18PSetNetworkWrapper23getNetworkSelectionModeERNS_20NetworkSelectionModeE @ 93 NONAME - _ZNK22PSetCallWaitingWrapper10metaObjectEv @ 94 NONAME - _ZNK24PSetCallDivertingWrapper10metaObjectEv @ 95 NONAME - _ZNK24PSetCallDivertingWrapper20validateDivertNumberERK7TDesC16 @ 96 NONAME - _ZNK24PSetCallDivertingWrapper8findPlusERK7TDesC16 @ 97 NONAME - _ZTI11PSetWrapper @ 98 NONAME - _ZTI14PSetCliWrapper @ 99 NONAME - _ZTI18PSetNetworkWrapper @ 100 NONAME - _ZTI22PSetCallWaitingWrapper @ 101 NONAME - _ZTI24PSetCallDivertingWrapper @ 102 NONAME - _ZTV11PSetWrapper @ 103 NONAME - _ZTV14PSetCliWrapper @ 104 NONAME - _ZTV18PSetNetworkWrapper @ 105 NONAME - _ZTV22PSetCallWaitingWrapper @ 106 NONAME - _ZTV24PSetCallDivertingWrapper @ 107 NONAME + _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 diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pri --- a/cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pri Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pri Fri Apr 16 15:31:58 2010 +0300 @@ -14,19 +14,22 @@ # Description: # -HEADERS += ../../../../phonesrv_plat/\phone_settings_api/inc/psetcalldivertingwrapper.h \ +HEADERS += ../../../../phonesrv_plat/\phone_settings_api/inc/psetcallbarringwrapper.h \ + ../../../../phonesrv_plat/\phone_settings_api/inc/psetcalldivertingwrapper.h \ ../../../../phonesrv_plat/\phone_settings_api/inc/psetcallwaitingwrapper.h \ ../../../../phonesrv_plat/\phone_settings_api/inc/psetcliwrapper.h \ ../../../../phonesrv_plat/\phone_settings_api/inc/psetnetworkwrapper.h \ ../../../../phonesrv_plat/\phone_settings_api/inc/psetwrapper.h \ ../../../../phonesrv_plat/\phone_settings_api/inc/psetwrappertypes.h \ + ./src/psetcallbarringwrapper_p.h \ ./src/psetcalldivertingwrapper_p.h \ ./src/psetcallwaitingwrapper_p.h \ ./src/psetcliwrapper_p.h \ ./src/psetnetworkwrapper_p.h symbian: { - SOURCES += ./src/psetcalldivertingwrapper_p.cpp \ + SOURCES += ./src/psetcallbarringwrapper_p.cpp \ + ./src/psetcalldivertingwrapper_p.cpp \ ./src/psetcliwrapper_p.cpp \ ./src/psetcallwaitingwrapper_p.cpp \ ./src/psetnetworkwrapper_p.cpp \ @@ -35,7 +38,8 @@ ./src/psetcallwaitingwrapper.cpp \ ./src/psetcalldivertingwrapper.cpp \ ./src/psetnetworkwrapper.cpp \ - ./src/psetnetworkinfoconverter.cpp + ./src/psetnetworkinfoconverter.cpp \ + ./src/psetcallbarringwrapper.cpp } else: { SOURCES = ./src/psetwrapper_s.cpp diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,83 @@ +/* + * 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 "psetcallbarringwrapper_p.h" +#include "logging.h" + +/*! + PSetCallBarringWrapper::PSetCallBarringWrapper + */ +PSetCallBarringWrapper::PSetCallBarringWrapper( + CPsetContainer &psetContainer, + QObject *parent) + : + QObject(parent), + m_privateImpl(new PSetCallBarringWrapperPrivate(*this, psetContainer)) +{ + DPRINT; +} + +/*! + PSetCallBarringWrapper::~PSetCallBarringWrapper + */ +PSetCallBarringWrapper::~PSetCallBarringWrapper() +{ + DPRINT; +} + +/*! + PSetCallBarringWrapper::barringStatus + */ +void PSetCallBarringWrapper::barringStatus( + PsServiceGroup serviceGroup, + BarringType barringType) +{ + DPRINT; + + m_privateImpl->barringStatus(serviceGroup, barringType); +} + +/*! + PSetCallBarringWrapper::enableBarring + */ +void PSetCallBarringWrapper::enableBarring( + PsServiceGroup serviceGroup, + BarringType barringType, + QString barringPassword) +{ + DPRINT; + + m_privateImpl->enableBarring(serviceGroup, barringType, barringPassword); +} + +/*! + PSetCallBarringWrapper::disableBarring + */ +void PSetCallBarringWrapper::disableBarring( + PsServiceGroup serviceGroup, + BarringType barringType, + QString barringPassword) +{ + DPRINT; + + m_privateImpl->disableBarring(serviceGroup, barringType, barringPassword); +} + +// End of File. diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,438 @@ +/* + * 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 "psetcallbarringwrapper.h" +#include "psetcallbarringwrapper_p.h" +#include "logging.h" + +TServiceGroup convertServiceGroup(PsServiceGroup serviceGroup) +{ + TServiceGroup convertedType = EServiceGroupVoice; + switch (serviceGroup) { + case ServiceGroupVoice: + convertedType = EServiceGroupVoice; + break; + case ServiceGroupData: + convertedType = EServiceGroupData; + break; + case ServiceGroupFax: + convertedType = EServiceGroupFax; + break; + case ServiceGroupAllTeleservices: + convertedType = EServiceGroupAllTeleservices; + break; + default: + break; + } + + return convertedType; +} + +PSetCallBarringWrapper::BarringType convertBarringType( + TBarringProgram barringType) +{ + PSetCallBarringWrapper::BarringType convertedType = + PSetCallBarringWrapper::BarringTypeAllBarrings; + switch (barringType) { + case EBarringTypeAllBarrings: + convertedType = PSetCallBarringWrapper::BarringTypeAllBarrings; + break; + case EBarringTypeAllOutgoing: + convertedType = PSetCallBarringWrapper::BarringTypeAllOutgoing; + break; + case EBarringTypeOutgoingInternational: + convertedType = PSetCallBarringWrapper::BarringTypeOutgoingInternational; + break; + case EBarringTypeOutgoingInternationalExceptToHomeCountry: + convertedType = PSetCallBarringWrapper:: + BarringTypeOutgoingInternationalExceptToHomeCountry; + break; + case EBarringTypeAllIncoming: + convertedType = PSetCallBarringWrapper::BarringTypeAllIncoming; + break; + case EBarringTypeIncomingWhenRoaming: + convertedType = PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming; + break; + case EBarringTypeAllServices: + convertedType = PSetCallBarringWrapper::BarringTypeAllServices; + break; + case EBarringTypeAllOutgoingServices: + convertedType = PSetCallBarringWrapper::BarringTypeAllOutgoingServices; + break; + case EBarringTypeAllIncomingServices: + convertedType = PSetCallBarringWrapper::BarringTypeAllIncomingServices; + break; + default: + break; + } + + return convertedType; +} + +TBarringProgram convertBarringType( + PSetCallBarringWrapper::BarringType barringType) +{ + TBarringProgram convertedType = EBarringTypeAllBarrings; + switch (barringType) { + case PSetCallBarringWrapper::BarringTypeAllBarrings: + convertedType = EBarringTypeAllBarrings; + break; + case PSetCallBarringWrapper::BarringTypeAllOutgoing: + convertedType = EBarringTypeAllOutgoing; + break; + case PSetCallBarringWrapper::BarringTypeOutgoingInternational: + convertedType = EBarringTypeOutgoingInternational; + break; + case PSetCallBarringWrapper:: + BarringTypeOutgoingInternationalExceptToHomeCountry: + convertedType + = EBarringTypeOutgoingInternationalExceptToHomeCountry; + break; + case PSetCallBarringWrapper::BarringTypeAllIncoming: + convertedType = EBarringTypeAllIncoming; + break; + case PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming: + convertedType = EBarringTypeIncomingWhenRoaming; + break; + case PSetCallBarringWrapper::BarringTypeAllServices: + convertedType = EBarringTypeAllServices; + break; + case PSetCallBarringWrapper::BarringTypeAllOutgoingServices: + convertedType = EBarringTypeAllOutgoingServices; + break; + case PSetCallBarringWrapper::BarringTypeAllIncomingServices: + convertedType = EBarringTypeAllIncomingServices; + break; + default: + break; + } + + return convertedType; +} + + +PSetCallBarringWrapper::BarringStatus convertBarringStatus( + TBarringStatus status) +{ + PSetCallBarringWrapper::BarringStatus convertedType = + PSetCallBarringWrapper::BarringStatusUnknown; + switch (status) { + case EBarringStatusActive: + convertedType = PSetCallBarringWrapper::BarringStatusActive; + break; + case EBarringStatusInactive: + convertedType = PSetCallBarringWrapper::BarringStatusInactive; + break; + case EBarringStatusNotProvisioned: + convertedType = + PSetCallBarringWrapper::BarringStatusNotProvisioned; + break; + case EBarringStatusUnavailable: + convertedType = PSetCallBarringWrapper::BarringStatusUnavailable; + break; + case EBarringStatusUnknown: + default: + convertedType = PSetCallBarringWrapper::BarringStatusUnknown; + break; + } + + return convertedType; +} + + +/*! + PSetCallBarringWrapperPrivate::PSetCallBarringWrapperPrivate + */ +PSetCallBarringWrapperPrivate::PSetCallBarringWrapperPrivate( + PSetCallBarringWrapper &owner, CPsetContainer &psetContainer) + : + m_owner(owner), + m_callBarring(NULL), + m_currentRequest(RequestNone), + m_barringError(PSetCallBarringWrapper::BarringErrorNone), + m_barringStatus(PSetCallBarringWrapper::BarringStatusUnknown), + m_barringType(PSetCallBarringWrapper::BarringTypeAllBarrings), + m_plural(false) +{ + DPRINT; + + QT_TRAP_THROWING( + m_callBarring = psetContainer.CreateCBObjectL(*this) + ) + + m_callBarring->SetRequestObserver(this); +} + + +/*! + PSetCallBarringWrapperPrivate::~PSetCallBarringWrapperPrivate + */ +PSetCallBarringWrapperPrivate::~PSetCallBarringWrapperPrivate() +{ + DPRINT; + + delete m_callBarring; +} + + +/*! + PSetCallBarringWrapperPrivate::barringStatus + */ +void PSetCallBarringWrapperPrivate::barringStatus( + PsServiceGroup serviceGroup, + PSetCallBarringWrapper::BarringType barringType) +{ + DPRINT; + + TServiceGroup convertedServiceGroup = convertServiceGroup(serviceGroup); + TBarringProgram convertedBarringType = convertBarringType(barringType); + + QT_TRAP_THROWING(m_callBarring->GetBarringStatusL( + convertedServiceGroup, convertedBarringType) + ) + + m_currentRequest = RequestBarringStatus; +} + + +/*! + PSetCallBarringWrapperPrivate::enableBarring + */ +void PSetCallBarringWrapperPrivate::enableBarring( + PsServiceGroup serviceGroup, + PSetCallBarringWrapper::BarringType barringType, + QString barringPassword) +{ + DPRINT; + + TCallBarringSetting setting; + setting.iType = convertBarringType(barringType); + setting.iSetting = EActivateBarring; + setting.iServiceGroup = convertServiceGroup(serviceGroup); + setting.iPassword.Copy(barringPassword.utf16()); + + TBasicServiceGroups serviceGroups = EAllTeleAndBearer; + QT_TRAP_THROWING( + m_callBarring->SetBarringL(setting, serviceGroups); + ) + + m_currentRequest = RequestEnableBarring; +} + + +/*! + PSetCallBarringWrapperPrivate::disableBarring + */ +void PSetCallBarringWrapperPrivate::disableBarring( + PsServiceGroup serviceGroup, + PSetCallBarringWrapper::BarringType barringType, + QString barringPassword) +{ + DPRINT; + + TCallBarringSetting setting; + setting.iType = convertBarringType(barringType); + setting.iSetting = ECancelBarring; + setting.iServiceGroup = convertServiceGroup(serviceGroup); + setting.iPassword.Copy(barringPassword.utf16()); + + TBasicServiceGroups serviceGroups = EAllTeleAndBearer; + QT_TRAP_THROWING( + m_callBarring->SetBarringL(setting, serviceGroups); + ) + + m_currentRequest = RequestDisableBarring; +} + + +/*! + From MPsetBarringObserver. + PSetCallBarringWrapperPrivate::HandleBarringModeChangedL + */ +void PSetCallBarringWrapperPrivate::HandleBarringModeChangedL( + TBarringProgram aType, + TBarringStatus aStatus, + TBool aPlural ) +{ + DPRINT; + Q_ASSERT(RequestEnableBarring == m_currentRequest || + RequestDisableBarring == m_currentRequest); + + m_barringType = convertBarringType(aType); + m_barringError = PSetCallBarringWrapper::BarringErrorNone; + m_barringStatus = convertBarringStatus(aStatus); + m_plural = static_cast(aPlural); +} + + +/*! + From MPsetBarringObserver. + PSetCallBarringWrapperPrivate::HandleBarringModeStatusL + */ +void PSetCallBarringWrapperPrivate::HandleBarringModeStatusL( + TUint8 aBsc[KPSetNumberOfBsc], + TBarringStatus aStatus ) +{ + DPRINT; + Q_ASSERT(RequestBarringStatus == m_currentRequest); + + m_barringError = PSetCallBarringWrapper::BarringErrorNone; + QT_TRYCATCH_LEAVING( + int index = 0; + unsigned char groupIdCandidate = aBsc[index]; + while ((groupIdCandidate + != static_cast(KPSetUnusedValue))) { + m_basicServiceGroupIds << groupIdCandidate; + groupIdCandidate = aBsc[++index]; + } + ) + m_barringStatus = convertBarringStatus(aStatus); +} + + +/*! + From MPsetBarringObserver. + PSetCallBarringWrapperPrivate::HandleBarringErrorL + */ +void PSetCallBarringWrapperPrivate::HandleBarringErrorL( + TInt aReason ) +{ + DPRINT; + Q_UNUSED(aReason) + + m_barringError = aReason; + m_basicServiceGroupIds.clear(); + m_barringStatus = PSetCallBarringWrapper::BarringStatusUnknown; + m_plural = false; +} + + +/*! + From MPsetBarringObserver. + PSetCallBarringWrapperPrivate::HandleCBRequestingL + */ +void PSetCallBarringWrapperPrivate::HandleCBRequestingL( + TBool aTrue, + TBool aInterrupted ) +{ + DPRINT; + + Q_UNUSED(aTrue) + Q_UNUSED(aInterrupted) +} + + +/*! + From MPsetBarringObserver. + PSetCallBarringWrapperPrivate::SetEngineContact + */ +void PSetCallBarringWrapperPrivate::SetEngineContact( + MPsetCallBarring* aBarringEngine ) +{ + DPRINT; + + Q_UNUSED(aBarringEngine) +} + + +/*! + From MPsetBarringObserver. + PSetCallBarringWrapperPrivate::CbPasswordChangedL + */ +void PSetCallBarringWrapperPrivate::CbPasswordChangedL( + TBool aSuccess ) +{ + DPRINT; + + Q_UNUSED(aSuccess) +} + + +/*! + From MPsetRequestObserver. + PSetCallBarringWrapperPrivate::RequestComplete + */ +void PSetCallBarringWrapperPrivate::RequestComplete() +{ + DPRINT; + Q_ASSERT(RequestNone != m_currentRequest); + BarringRequest completedRequest = m_currentRequest; + m_currentRequest = RequestNone; + + switch (completedRequest) + { + case RequestBarringStatus: + { + int errorCode = 0; + QT_TRYCATCH_ERROR( errorCode, + emit m_owner.barringStatusRequestCompleted( + m_barringError, + m_basicServiceGroupIds, + m_barringStatus); + ) + DPRINT << "RequestBarringStatus ERROR:" << errorCode; + break; + } + + case RequestEnableBarring: + { + int errorCode = 0; + QT_TRYCATCH_ERROR( errorCode, + emit m_owner.enableBarringRequestCompleted( + m_barringError, + m_barringType, + m_barringStatus, + m_plural); + ) + DPRINT << "RequestEnableBarring ERROR:" << errorCode; + break; + } + + case RequestDisableBarring: + { + int errorCode = 0; + QT_TRYCATCH_ERROR( errorCode, + emit m_owner.disableBarringRequestCompleted( + m_barringError, + m_barringType, + m_barringStatus, + m_plural); + ) + DPRINT << "RequestDisableBarring ERROR:" << errorCode; + break; + } + default: + break; + } +} + + +/*! + From MPsetRequestObserver. + PSetCallBarringWrapperPrivate::RequestStatusChanged + */ +void PSetCallBarringWrapperPrivate::RequestStatusChanged( + TInt aNewStatus) +{ + DPRINT; + Q_UNUSED(aNewStatus) + Q_ASSERT(RequestNone != m_currentRequest); +} + +// End of File. diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ + +#ifndef PSETCALLBARRINGWRAPPER_P_H +#define PSETCALLBARRINGWRAPPER_P_H + +#include +#include +#include +#include + +// Forward declarations +class PSetCallBarringWrapper; +class CPsetContainer; +class CPsetCallBarring; + +class PSetCallBarringWrapperPrivate + : public MPsetBarringObserver, public MPsetRequestObserver +{ +public: + + enum BarringRequest + { + RequestNone, + RequestBarringStatus, + RequestEnableBarring, + RequestDisableBarring + }; + +public: + + PSetCallBarringWrapperPrivate( + PSetCallBarringWrapper &owner, + CPsetContainer &psetContainer); + + ~PSetCallBarringWrapperPrivate(); + + void barringStatus( + PsServiceGroup serviceGroup, + PSetCallBarringWrapper::BarringType barringType); + + void enableBarring( + PsServiceGroup serviceGroup, + PSetCallBarringWrapper::BarringType barringType, + QString barringPassword); + + void disableBarring( + PsServiceGroup serviceGroup, + PSetCallBarringWrapper::BarringType barringType, + QString barringPassword); + +public: // From MPsetBarringObserver + + /** + * From MPsetBarringObserver. + * @see MPsetBarringObserver. + */ + void HandleBarringModeChangedL( + TBarringProgram aType, + TBarringStatus aStatus, + TBool aPlural ); + + /** + * From MPsetBarringObserver. + * @see MPsetBarringObserver. + */ + void HandleBarringModeStatusL( + TUint8 aBsc[KPSetNumberOfBsc], + TBarringStatus aStatus ); + + /** + * From MPsetBarringObserver. + * @see MPsetBarringObserver. + */ + void HandleBarringErrorL( + TInt aReason ); + + /** + * From MPsetBarringObserver. + * @see MPsetBarringObserver. + */ + void HandleCBRequestingL( + TBool aTrue, + TBool aInterrupted ); + + /** + * From MPsetBarringObserver. + * @see MPsetBarringObserver. + */ + void SetEngineContact( + MPsetCallBarring* aBarringEngine ); + + /** + * From MPsetBarringObserver. + * @see MPsetBarringObserver. + */ + void CbPasswordChangedL( + TBool aSuccess ); + +public: // From MPsetRequestObserver + + /** + * From MPsetRequestObserver. + * @see MPsetRequestObserver. + */ + void RequestComplete(); + + /** + * From MPsetRequestObserver. + * @see MPsetRequestObserver. + */ + void RequestStatusChanged( + TInt aNewStatus); + +private: + + /** Owner. */ + PSetCallBarringWrapper &m_owner; + + /** Call barring supplementary service handler. */ + CPsetCallBarring *m_callBarring; + + /** Current barring request. */ + BarringRequest m_currentRequest; + + /** Error info from last completed request. */ + int m_barringError; + + /** Basic service group identifiers from last completed request. */ + QList m_basicServiceGroupIds; + + /** Barring status from last completed request. */ + PSetCallBarringWrapper::BarringStatus m_barringStatus; + + /** Barring type from last completed request. */ + PSetCallBarringWrapper::BarringType m_barringType; + + /** Plurality from last completed request. */ + bool m_plural; +}; + +#endif // PSETCALLBARRINGWRAPPER_P diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallwaitingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallwaitingwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallwaitingwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,8 +16,8 @@ */ #include -#include -#include +#include +#include #include "psetcallwaitingwrapper.h" #include "psetcallwaitingwrapper_p.h" #include "logging.h" diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallwaitingwrapper_p.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallwaitingwrapper_p.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallwaitingwrapper_p.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,8 +16,8 @@ */ #include -#include -#include +#include +#include #include "psetcallwaitingwrapper.h" #include "psetcallwaitingwrapper_p.h" #include "logging.h" diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include /*! PSetCliWrapper::PSetCliWrapper diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper_p.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper_p.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper_p.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,8 +20,8 @@ #include "psetwrappertypes.h" #include "logging.h" #include -#include -#include +#include +#include /*! PSetCliWrapperPrivate::PSetCliWrapperPrivate diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkinfoconverter.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkinfoconverter.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkinfoconverter.h Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ #define PSETNETWORKINFOCONVERTER_H #include -#include +#include class NetworkInfoConverter { diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -134,8 +134,6 @@ { DPRINT << ": IN"; - Q_CHECK_PTR(m_privateImpl); - DPRINT << ": OUT"; } diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper_p.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper_p.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper_p.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,8 +16,8 @@ */ #include -#include -#include +#include +#include #include #include "psetnetworkwrapper_p.h" #include "logging.h" @@ -188,7 +188,8 @@ //then insert found networks for(int i = 0; i < itemsCount; i++) { - PSetNetworkWrapper::NetworkInfo *info = new PSetNetworkWrapper::NetworkInfo; + PSetNetworkWrapper::NetworkInfo *info = + new (ELeave) PSetNetworkWrapper::NetworkInfo; info->m_id.m_countryCode = QString::fromUtf16( aInfoArray->At(i).iId.iCountryCode.Ptr(), @@ -217,7 +218,9 @@ m_networkInfoList.append(info); } - emit m_owner.availableNetworksGot(m_networkInfoList); + QT_TRYCATCH_LEAVING( + emit m_owner.availableNetworksGot(m_networkInfoList); + ) DPRINT << ": OUT "; } @@ -300,7 +303,9 @@ break; } - emit m_owner.networkChanged(info, status); + QT_TRYCATCH_LEAVING( + emit m_owner.networkChanged(info, status); + ) DPRINT << ": OUT "; } @@ -316,7 +321,9 @@ PSetNetworkWrapper::RequestType type = static_cast(aRequest); - emit m_owner.searchingNetworks(type); + QT_TRYCATCH_LEAVING( + emit m_owner.searchingNetworks(type); + ) DPRINT << ": OUT "; } @@ -330,8 +337,10 @@ { DPRINT << ": IN "; - emit m_owner.requestingSelectedNetwork( - static_cast(aOngoing)); + QT_TRYCATCH_LEAVING( + emit m_owner.requestingSelectedNetwork( + static_cast(aOngoing)); + ) DPRINT << ": OUT "; } @@ -371,8 +380,10 @@ break; } - emit m_owner.networkReqestFailed( - error, static_cast(aRequest)); + QT_TRYCATCH_LEAVING( + emit m_owner.networkReqestFailed( + error, static_cast(aRequest)); + ) } /*! diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper_p.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper_p.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetnetworkwrapper_p.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "psetnetworkwrapper.h" diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,12 +16,13 @@ */ -#include +#include #include "psetwrapper.h" #include "psetcliwrapper.h" #include "psetcallwaitingwrapper.h" #include "psetcalldivertingwrapper.h" #include "psetnetworkwrapper.h" +#include "psetcallbarringwrapper.h" #include "logging.h" /*! @@ -33,7 +34,8 @@ m_wrapperCli(NULL), m_callWaitingWrapper(NULL), m_callDivertingWrapper(NULL), - m_networkWrapper(NULL) + m_networkWrapper(NULL), + m_callBarringWrapper(NULL) { DPRINT << ": IN "; @@ -54,6 +56,7 @@ delete m_callDivertingWrapper; delete m_networkWrapper; delete m_psetContainer; + delete m_callBarringWrapper; DPRINT << ": OUT "; } @@ -120,4 +123,19 @@ return *m_networkWrapper; } +/*! + PSetWrapper::callBarringWrapper + */ +PSetCallBarringWrapper& PSetWrapper::callBarringWrapper() +{ + DPRINT; + + if (!m_callBarringWrapper) { + m_callBarringWrapper = + new PSetCallBarringWrapper(*m_psetContainer, this); + } + + return *m_callBarringWrapper; +} + // End of File. diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/src/psetwrapper_s.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetwrapper_s.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetwrapper_s.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,6 +21,7 @@ #include "psetcallwaitingwrapper.h" #include "psetcalldivertingwrapper.h" #include "psetnetworkwrapper.h" +#include "psetcallbarringwrapper.h" #include "logging.h" @@ -185,10 +186,11 @@ // -------- Wrapper interface --------- // -void PSetCallDivertingWrapper::setCallDiverting( +int PSetCallDivertingWrapper::setCallDiverting( PSCallDivertingCommand& aSetting, int aBasicServiceGroup) { DPRINT << "DUMMY WRAPPER"; + return 0; } void PSetCallDivertingWrapper::getCallDivertingStatus( @@ -215,6 +217,11 @@ m_DefaultnumberListQSList.append(aNumber); } +void PSetCallDivertingWrapper::getVoiceMailBoxNumber(QString &/*aVmbxNumber*/) +{ + DPRINT << "DUMMY WRAPPER"; +} + PSetNetworkWrapper::PSetNetworkWrapper( CPsetContainer &psetContainer, QObject *parent) : QObject(parent) @@ -260,4 +267,26 @@ DPRINT << "DUMMY WRAPPER"; } +class PSetCallBarringWrapperPrivate { +public: + PSetCallBarringWrapperPrivate() {} + ~PSetCallBarringWrapperPrivate() {} +}; + +PSetCallBarringWrapper::PSetCallBarringWrapper( + CPsetContainer &psetContainer, + QObject *parent) + : + QObject(parent) +{ + DPRINT << "DUMMY PSetCallBarringWrapper"; +} + + +PSetCallBarringWrapper::~PSetCallBarringWrapper() +{ + DPRINT << "DUMMY PSetCallBarringWrapper"; +} + + // End of File. diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cphcltemergencycall.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cphcltemergencycall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cphcltemergencycall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,7 +16,7 @@ */ #include -#include +#include #include "mock_cphcltemergencycall.h" TBool CPhCltEmergencyCallMock::iSimulateEmergencyNumberMatch = EFalse; diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cphcltemergencycall.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cphcltemergencycall.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cphcltemergencycall.h Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ #define CPHCLTEMERGENCYCALLMOCK_H #include -#include +#include // FORWARD DECLARATIONS class MPhCltEmergencyCallObserver; diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cvoicemailboxentry.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cvoicemailboxentry.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_cvoicemailboxentry.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -145,7 +145,6 @@ SMC_MOCK_METHOD1( void, const TVmbxAlsLineType &, aLine ) } - // ----------------------------------------------------------------------------- // CVoiceMailboxEntry::GetVmbxNumber // ----------------------------------------------------------------------------- @@ -153,9 +152,6 @@ TInt CVoiceMailboxEntry::GetVmbxNumber( TPtrC & aVmbxNumber ) const { -// _LIT(vmbxNumber, "1234"); -// TPtrC vmbxNumber( _LIT("12345" )); -// aVmbxNumber = vmbxNumber; SMC_MOCK_METHOD1( TInt, TPtrC &, aVmbxNumber ) } diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallbarring.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallbarring.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,178 @@ +/* +* 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 + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::CPsetCallBarring +// ----------------------------------------------------------------------------- +// +CPsetCallBarring::CPsetCallBarring( + RMobilePhone & aPhone ) + : + CActive(EPriorityStandard), + iPhone(aPhone) + { + + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::ConstructL +// ----------------------------------------------------------------------------- +// +void CPsetCallBarring::ConstructL( + MPsetBarringObserver & /*aObserver*/ ) + { + + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::NewL +// ----------------------------------------------------------------------------- +// +CPsetCallBarring * CPsetCallBarring::NewL( + MPsetBarringObserver & aObserver, + RMobilePhone & aPhone ) + { + SMC_MOCK_NEWL2( CPsetCallBarring *, MPsetBarringObserver &, aObserver, + RMobilePhone &, aPhone ) + + CPsetCallBarring* self = new( ELeave ) CPsetCallBarring(aPhone); + CleanupStack::PushL( self ); + //self->ConstructL() + CleanupStack::Pop( self ); + return self; + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::~CPsetCallBarring +// ----------------------------------------------------------------------------- +// +CPsetCallBarring::~CPsetCallBarring( ) + { + + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::SetBarringL +// ----------------------------------------------------------------------------- +// +void CPsetCallBarring::SetBarringL( + const TCallBarringSetting & aBarring, + TBasicServiceGroups aBsc ) + { + SMC_MOCK_METHOD2( void, const TCallBarringSetting &, aBarring, + TBasicServiceGroups, aBsc ) + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::GetBarringStatusL +// ----------------------------------------------------------------------------- +// +void CPsetCallBarring::GetBarringStatusL( + const TServiceGroup aGroup, + const TBarringProgram aMode ) + { + SMC_MOCK_METHOD2( void, const TServiceGroup, aGroup, + const TBarringProgram, aMode ) + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::CancelCurrentRequest +// ----------------------------------------------------------------------------- +// +TInt CPsetCallBarring::CancelCurrentRequest( ) + { + SMC_MOCK_METHOD0( TInt ) + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::PhoneSettingChanged +// ----------------------------------------------------------------------------- +// +void CPsetCallBarring::PhoneSettingChanged( + TSSSettingsSetting aSetting, + TInt aNewValue ) + { + SMC_MOCK_METHOD2( void, TSSSettingsSetting, aSetting, + TInt, aNewValue ) + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::ChangePasswordL +// ----------------------------------------------------------------------------- +// +void CPsetCallBarring::ChangePasswordL( + RMobilePhone::TMobilePhonePasswordChangeV2 & aPwds, + TBool aIsBarringPassword ) + { + SMC_MOCK_METHOD2( void, RMobilePhone::TMobilePhonePasswordChangeV2 &, aPwds, + TBool, aIsBarringPassword ) + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::ChangePasswordL +// ----------------------------------------------------------------------------- +// +void CPsetCallBarring::ChangePasswordL( + RMobilePhone::TMobilePhonePasswordChangeV2 & aPwds ) + { + SMC_MOCK_METHOD1( void, RMobilePhone::TMobilePhonePasswordChangeV2 &, aPwds ) + } + + +// ----------------------------------------------------------------------------- +// CPsetCallBarring::SetRequestObserver +// ----------------------------------------------------------------------------- +// +void CPsetCallBarring::SetRequestObserver( + MPsetRequestObserver * aObs ) + { + SMC_MOCK_METHOD1( void, MPsetRequestObserver *, aObs ) + } + + +// --------------------------------------------------------------------------- +// CPsetCallBarring::DoCancel +// --------------------------------------------------------------------------- +// +void CPsetCallBarring::DoCancel() + { + + } +// --------------------------------------------------------------------------- +// CPsetCallBarring::RunL + +// --------------------------------------------------------------------------- +// +void CPsetCallBarring::RunL() + { + } diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallbarringwrapper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallbarringwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,96 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies 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 "psetcallbarringwrapper.h" + +class PSetCallBarringWrapperPrivate { +public: + PSetCallBarringWrapperPrivate() {} + ~PSetCallBarringWrapperPrivate() {} +}; + + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// PSetCallBarringWrapper::PSetCallBarringWrapper +// ----------------------------------------------------------------------------- +// +PSetCallBarringWrapper::PSetCallBarringWrapper( + CPsetContainer & psetContainer, + QObject * parent ) + : + QObject(parent) + { + Q_UNUSED(psetContainer) + } + + +// ----------------------------------------------------------------------------- +// PSetCallBarringWrapper::~PSetCallBarringWrapper +// ----------------------------------------------------------------------------- +// +PSetCallBarringWrapper::~PSetCallBarringWrapper( ) + { + + } + + +// ----------------------------------------------------------------------------- +// PSetCallBarringWrapper::barringStatus +// ----------------------------------------------------------------------------- +// +void PSetCallBarringWrapper::barringStatus( + PsServiceGroup serviceGroup, + BarringType barringType ) + { + SMC_MOCK_METHOD2( void, int/*PsServiceGroup*/, static_cast(serviceGroup), + BarringType, barringType ) + } + + +// ----------------------------------------------------------------------------- +// PSetCallBarringWrapper::enableBarring +// ----------------------------------------------------------------------------- +// +void PSetCallBarringWrapper::enableBarring( + PsServiceGroup serviceGroup, + BarringType barringType, + QString barringPassword) + { + SMC_MOCK_METHOD3( void, int/*PsServiceGroup*/, static_cast(serviceGroup), + BarringType, barringType, QString, barringPassword ) + } + + +// ----------------------------------------------------------------------------- +// PSetCallBarringWrapper::disableBarring +// ----------------------------------------------------------------------------- +// +void PSetCallBarringWrapper::disableBarring( + PsServiceGroup serviceGroup, + BarringType barringType, + QString barringPassword) + { + SMC_MOCK_METHOD3( void, int/*PsServiceGroup*/, static_cast(serviceGroup), + BarringType, barringType, QString, barringPassword ) + } diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcalldiverting.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcalldiverting.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcalldiverting.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include "PsetCallDiverting.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallwaiting.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallwaiting.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallwaiting.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,7 +16,7 @@ */ #include -#include +#include #include "PsetCallWaiting.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcli.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcli.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcli.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -15,7 +15,7 @@ * */ #include -#include +#include #include "PsetCli.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcontainer.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcontainer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcontainer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,7 +16,7 @@ */ #include #include -#include +#include #include "PsetContainer.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,743 @@ +/* +* 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 "ut_psetcallbarringwrapper.h" +#include "testutilities.h" +#define private public +#include +#include "psetcallbarringwrapper_p.h" + +const int KInvalidEnumeration = -1; + +class BarringObserver : public MPsetBarringObserver +{ + void HandleBarringModeChangedL( + TBarringProgram aType, + TBarringStatus aStatus, + TBool aPlural ) + { + Q_UNUSED(aType); + Q_UNUSED(aStatus); + Q_UNUSED(aPlural); + } + + void HandleBarringModeStatusL( + TUint8 aBsc[KPSetNumberOfBsc], + TBarringStatus aStatus ) + { + Q_UNUSED(aBsc); + Q_UNUSED(aStatus); + } + + void HandleBarringErrorL( + TInt aReason ) + { + Q_UNUSED(aReason); + } + + void HandleCBRequestingL( + TBool aTrue, + TBool aInterrupted ) + { + Q_UNUSED(aTrue); + Q_UNUSED(aInterrupted); + } + + void SetEngineContact( + MPsetCallBarring* aBarringEngine ) + { + Q_UNUSED(aBarringEngine); + } + + void CbPasswordChangedL( + TBool aSuccess ) + { + Q_UNUSED(aSuccess); + } +}; + + +/*! + UT_PSetCallBarringWrapper::UT_PSetCallBarringWrapper + */ +UT_PSetCallBarringWrapper::UT_PSetCallBarringWrapper() + : + m_psetContainerMock(NULL), + m_wrapper(NULL) +{ +} + + +/*! + UT_PSetCallBarringWrapper::~UT_PSetCallBarringWrapper + */ +UT_PSetCallBarringWrapper::~UT_PSetCallBarringWrapper() +{ + delete m_psetContainerMock; + delete m_wrapper; +} + + +/*! + UT_PSetCallBarringWrapper::init + */ +void UT_PSetCallBarringWrapper::init() +{ + initialize(); + + m_psetContainerMock = new CPsetContainer(); + + BarringObserver dummyObserver; + RMobilePhone dummyPhone; + + CPsetCallBarring *barringMock = NULL; + TRAPD(result, barringMock = CPsetCallBarring::NewL(dummyObserver, dummyPhone)); + QScopedPointer barringMockGuard(barringMock); + EXPECT(CPsetContainer::CreateCBObjectL) + .returns(barringMock); + m_wrapper = new PSetCallBarringWrapper(*m_psetContainerMock, NULL); + barringMockGuard.take(); + + QVERIFY(verify()); +} + + +/*! + UT_PSetCallBarringWrapper::cleanup + */ +void UT_PSetCallBarringWrapper::cleanup() +{ + reset(); + + delete m_psetContainerMock; + m_psetContainerMock = NULL; + delete m_wrapper; + m_wrapper = NULL; +} + + +/*! + UT_PSetCallBarringWrapper::t_construction + */ +void UT_PSetCallBarringWrapper::t_construction() +{ + EXPECT(CPsetContainer::CreateCBObjectL). + willOnce(invokeWithoutArguments(this, simulateLeaveAtMockMethodCall)); + PSetCallBarringWrapper *wrapper = NULL; + EXPECT_EXCEPTION( + wrapper = new PSetCallBarringWrapper(*m_psetContainerMock, NULL);); +} + + +/*! + UT_PSetCallBarringWrapper::t_barringStatus + */ +void UT_PSetCallBarringWrapper::t_barringStatus() +{ +// test status query with different service groups + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllBarrings); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupData, EBarringTypeAllBarrings); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupFax, EBarringTypeAllBarrings); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupAllTeleservices, EBarringTypeAllBarrings); + // invalid/unknown enumeration as service group identifier + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllBarrings); + + //TODO: remove SeviceGroupUnknown enumeration? + //m_wrapper->barringStatus(ServiceGroupUnknown); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->barringStatus(ServiceGroupData, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->barringStatus(ServiceGroupFax, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->barringStatus(ServiceGroupAllTeleservices, + PSetCallBarringWrapper::BarringTypeAllBarrings); + // invalid/unknown enumeration as service group identifier + m_wrapper->barringStatus( + static_cast(KInvalidEnumeration), + PSetCallBarringWrapper::BarringTypeAllBarrings); + +// test status query with different barring types + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllOutgoing); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeOutgoingInternational); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, + EBarringTypeOutgoingInternationalExceptToHomeCountry); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllIncoming); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeIncomingWhenRoaming); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllServices); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllOutgoingServices); + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllIncomingServices); + // invalid/unknown enumeration as barring type + EXPECT(CPsetCallBarring::GetBarringStatusL) + .with(EServiceGroupVoice, EBarringTypeAllBarrings); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllOutgoing); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeOutgoingInternational); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper:: + BarringTypeOutgoingInternationalExceptToHomeCountry); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllIncoming); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllServices); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllOutgoingServices); + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllIncomingServices); + // invalid/unknown enumeration as barring type + m_wrapper->barringStatus(ServiceGroupVoice, + static_cast(KInvalidEnumeration)); + + QVERIFY(verify()); +} + + +/*! + UT_PSetCallBarringWrapper::t_barringStatusExceptionOccurs + */ +void UT_PSetCallBarringWrapper::t_barringStatusExceptionOccurs() +{ + EXPECT(CPsetCallBarring::GetBarringStatusL) + .willOnce(invokeWithoutArguments(this, simulateLeaveAtMockMethodCall)); + + EXPECT_EXCEPTION( + m_wrapper->barringStatus( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + ) + + QVERIFY(verify()); +} + + +/*! + UT_PSetCallBarringWrapper::t_enableBarring + */ +void UT_PSetCallBarringWrapper::t_enableBarring() +{ + _LIT(KPassword, "1234"); + TCallBarringSetting setting; + setting.iType = EBarringTypeAllBarrings; + setting.iSetting = EActivateBarring; + setting.iServiceGroup = EServiceGroupVoice; + setting.iPassword.Copy(KPassword()); + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings, + QString("1234")); + + setting.iType = EBarringTypeAllOutgoing; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllOutgoing, + QString("1234")); + + setting.iType = EBarringTypeOutgoingInternational; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeOutgoingInternational, + QString("1234")); + + setting.iType = EBarringTypeOutgoingInternationalExceptToHomeCountry; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry, + QString("1234")); + + setting.iType = EBarringTypeAllIncoming; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllIncoming, + QString("1234")); + + setting.iType = EBarringTypeIncomingWhenRoaming; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming, + QString("1234")); + + setting.iType = EBarringTypeAllServices; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllServices, + QString("1234")); + + setting.iType = EBarringTypeAllOutgoingServices; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllOutgoingServices, + QString("1234")); + + setting.iType = EBarringTypeAllIncomingServices; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllIncomingServices, + QString("1234")); + + QVERIFY(verify()); +} + + +/*! + UT_PSetCallBarringWrapper::t_disableBarring + */ +void UT_PSetCallBarringWrapper::t_disableBarring() +{ + _LIT(KPassword, "1234"); + TCallBarringSetting setting; + setting.iType = EBarringTypeAllBarrings; + setting.iSetting = ECancelBarring; + setting.iServiceGroup = EServiceGroupVoice; + setting.iPassword.Copy(KPassword()); + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings, + QString("1234")); + + setting.iType = EBarringTypeAllOutgoing; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllOutgoing, + QString("1234")); + + setting.iType = EBarringTypeOutgoingInternational; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeOutgoingInternational, + QString("1234")); + + setting.iType = EBarringTypeOutgoingInternationalExceptToHomeCountry; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry, + QString("1234")); + + setting.iType = EBarringTypeAllIncoming; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllIncoming, + QString("1234")); + + setting.iType = EBarringTypeIncomingWhenRoaming; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming, + QString("1234")); + + setting.iType = EBarringTypeAllServices; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllServices, + QString("1234")); + + setting.iType = EBarringTypeAllOutgoingServices; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllOutgoingServices, + QString("1234")); + + setting.iType = EBarringTypeAllIncomingServices; + EXPECT(CPsetCallBarring::SetBarringL) + .with(setting, EAllTeleAndBearer); + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllIncomingServices, + QString("1234")); + + QVERIFY(verify()); +} + + +/*! + UT_PSetCallBarringWrapper::t_HandleBarringModeChangedL + */ +void UT_PSetCallBarringWrapper::t_HandleBarringModeChangedL() +{ + TBool plural = EFalse; + QT_TRAP_THROWING( + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllBarrings, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllOutgoing, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeOutgoingInternational, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeOutgoingInternationalExceptToHomeCountry, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllIncoming, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeIncomingWhenRoaming, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllServices, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllOutgoingServices, EBarringStatusActive, plural); + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllIncomingServices, EBarringStatusActive, plural); + ) +} + + +/*! + UT_PSetCallBarringWrapper::t_HandleBarringErrorL + */ +void UT_PSetCallBarringWrapper::t_HandleBarringErrorL() +{ + // TODO: dummy test as functionality not yet implemented + QT_TRAP_THROWING( + m_wrapper->m_privateImpl->HandleBarringErrorL(KErrGeneral); + ) +} + + +/*! + UT_PSetCallBarringWrapper::t_HandleCBRequestingL + */ +void UT_PSetCallBarringWrapper::t_HandleCBRequestingL() +{ + // TODO: dummy test as functionality not yet implemented + QT_TRAP_THROWING( + m_wrapper->m_privateImpl->HandleCBRequestingL(EFalse, EFalse); + ) +} + + +/*! + UT_PSetCallBarringWrapper::t_SetEngineContact + */ +void UT_PSetCallBarringWrapper::t_SetEngineContact() +{ + // TODO: dummy test as functionality not yet implemented + m_wrapper->m_privateImpl->SetEngineContact(NULL); +} + + +/*! + UT_PSetCallBarringWrapper::t_CbPasswordChangedL + */ +void UT_PSetCallBarringWrapper::t_CbPasswordChangedL() +{ + // TODO: dummy test as functionality not yet implemented + TBool success = EFalse; + QT_TRAP_THROWING( + m_wrapper->m_privateImpl->CbPasswordChangedL(success); + ) +} + + +/*! + UT_PSetCallBarringWrapper::t_HandleBarringModeStatusL + */ +Q_DECLARE_METATYPE(PSetCallBarringWrapper::BarringStatus) +Q_DECLARE_METATYPE(QList) +void UT_PSetCallBarringWrapper::t_HandleBarringModeStatusL() +{ + qRegisterMetaType + ("PSetCallBarringWrapper::BarringStatus"); + qRegisterMetaType >("QList"); + QSignalSpy spy(m_wrapper, + SIGNAL(barringStatusRequestCompleted( + int, + const QList &, + PSetCallBarringWrapper::BarringStatus))); + + TUint8 basicServiceGroupIds[KPSetNumberOfBsc]; + basicServiceGroupIds[0] = EServiceGroupVoice; + basicServiceGroupIds[1] = KPSetUnusedValue; +// test with different barring statuses + QT_TRAP_THROWING( + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->m_privateImpl->HandleBarringModeStatusL( + basicServiceGroupIds, EBarringStatusActive); + m_wrapper->m_privateImpl->RequestComplete(); + + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->m_privateImpl->HandleBarringModeStatusL( + basicServiceGroupIds, EBarringStatusInactive); + m_wrapper->m_privateImpl->RequestComplete(); + + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->m_privateImpl->HandleBarringModeStatusL( + basicServiceGroupIds, EBarringStatusNotProvisioned); + m_wrapper->m_privateImpl->RequestComplete(); + + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->m_privateImpl->HandleBarringModeStatusL( + basicServiceGroupIds, EBarringStatusUnavailable); + m_wrapper->m_privateImpl->RequestComplete(); + + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->m_privateImpl->HandleBarringModeStatusL( + basicServiceGroupIds, EBarringStatusUnknown); + m_wrapper->m_privateImpl->RequestComplete(); + + // invalid/unknown enumeration as barring status + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->m_privateImpl->HandleBarringModeStatusL( + basicServiceGroupIds, + static_cast(KInvalidEnumeration)); + m_wrapper->m_privateImpl->RequestComplete(); + ) + + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") == 0) { + // Signal emissions from RequestComplete will fail with exception safety + // tests so it's not possible to verify signal data. + return; + } + + QCOMPARE(spy.count(), 6); + QList resultBasicServiceGroupIds = + qvariant_cast >(spy.at(0).at(1)); + QVERIFY(ServiceGroupVoice == resultBasicServiceGroupIds[0]); + QVERIFY(PSetCallBarringWrapper::BarringStatusActive == + qvariant_cast(spy.at(0).at(2))); + + resultBasicServiceGroupIds = + qvariant_cast >(spy.at(1).at(1)); + QVERIFY(ServiceGroupVoice == resultBasicServiceGroupIds[0]); + QVERIFY(PSetCallBarringWrapper::BarringStatusInactive == + qvariant_cast(spy.at(1).at(2))); + + resultBasicServiceGroupIds = + qvariant_cast >(spy.at(2).at(1)); + QVERIFY(ServiceGroupVoice == resultBasicServiceGroupIds[0]); + QVERIFY(PSetCallBarringWrapper::BarringStatusNotProvisioned == + qvariant_cast(spy.at(2).at(2))); + + resultBasicServiceGroupIds = + qvariant_cast >(spy.at(3).at(1)); + QVERIFY(ServiceGroupVoice == resultBasicServiceGroupIds[0]); + QVERIFY(PSetCallBarringWrapper::BarringStatusUnavailable == + qvariant_cast(spy.at(3).at(2))); + + resultBasicServiceGroupIds = + qvariant_cast >(spy.at(4).at(1)); + QVERIFY(ServiceGroupVoice == resultBasicServiceGroupIds[0]); + QVERIFY(PSetCallBarringWrapper::BarringStatusUnknown == + qvariant_cast(spy.at(4).at(2))); + + // invalid/unknown enumeration as barring status + resultBasicServiceGroupIds = + qvariant_cast >(spy.at(5).at(1)); + QVERIFY(ServiceGroupVoice == resultBasicServiceGroupIds[0]); + QVERIFY(PSetCallBarringWrapper::BarringStatusUnknown == + qvariant_cast(spy.at(5).at(2))); +} + + +/*! + UT_PSetCallBarringWrapper::t_HandleBarringModeStatusNoBasicServiceGroupIdsL + */ +void UT_PSetCallBarringWrapper::t_HandleBarringModeStatusNoBasicServiceGroupIdsL() +{ + TUint8 basicServiceGroupIds[KPSetNumberOfBsc]; + basicServiceGroupIds[0] = KPSetUnusedValue; + QSignalSpy spy(m_wrapper, + SIGNAL(barringStatusRequestCompleted( + int, + const QList &, + PSetCallBarringWrapper::BarringStatus))); + + QT_TRAP_THROWING( + m_wrapper->barringStatus(ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings); + m_wrapper->m_privateImpl->HandleBarringModeStatusL( + basicServiceGroupIds, EBarringStatusActive); + m_wrapper->m_privateImpl->RequestComplete(); + ) + + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") == 0) { + // Signal emissions from RequestComplete will fail with exception safety + // tests so it's not possible to verify signal data. + return; + } + + QCOMPARE(spy.count(), 1); + QVERIFY(PSetCallBarringWrapper::BarringStatusActive == + qvariant_cast(spy.at(0).at(2))); +} + + +/*! + UT_PSetCallBarringWrapper::t_enableBarringRequestComplete + */ +Q_DECLARE_METATYPE(PSetCallBarringWrapper::BarringType) +void UT_PSetCallBarringWrapper::t_enableBarringRequestComplete() +{ + qRegisterMetaType( + "PSetCallBarringWrapper::BarringType"); + QSignalSpy spy( + m_wrapper, + SIGNAL(enableBarringRequestCompleted(int, + PSetCallBarringWrapper::BarringType, + PSetCallBarringWrapper::BarringStatus, + bool))); + + TCallBarringSetting setting; + m_wrapper->enableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings, + QString("1234")); + QT_TRAP_THROWING( + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllBarrings, EBarringStatusActive, EFalse); + ); + m_wrapper->m_privateImpl->RequestComplete(); + + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") == 0) { + // Signal emissions from RequestComplete will fail with exception safety + // tests so it's not possible to verify signal data. + return; + } + + QCOMPARE(spy.count(), 1); + QCOMPARE(spy.at(0).at(0).toInt(), 0); + QCOMPARE(spy.at(0).at(1).value(), + PSetCallBarringWrapper::BarringTypeAllBarrings); + QCOMPARE(spy.at(0).at(2).value(), + PSetCallBarringWrapper::BarringStatusActive); + QCOMPARE(spy.at(0).at(3).toBool(), false); +} + + +/*! + UT_PSetCallBarringWrapper::t_disableBarringRequestComplete + */ +void UT_PSetCallBarringWrapper::t_disableBarringRequestComplete() +{ + QSignalSpy spy( + m_wrapper, + SIGNAL(disableBarringRequestCompleted(int, + PSetCallBarringWrapper::BarringType, + PSetCallBarringWrapper::BarringStatus, + bool))); + + TCallBarringSetting setting; + m_wrapper->disableBarring( + ServiceGroupVoice, + PSetCallBarringWrapper::BarringTypeAllBarrings, + QString("1234")); + QT_TRAP_THROWING( + m_wrapper->m_privateImpl->HandleBarringModeChangedL( + EBarringTypeAllBarrings, EBarringStatusNotProvisioned, EFalse); + ); + m_wrapper->m_privateImpl->RequestComplete(); + + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") == 0) { + // Signal emissions from RequestComplete will fail with exception safety + // tests so it's not possible to verify signal data. + return; + } + + QCOMPARE(spy.count(), 1); + QCOMPARE(spy.at(0).at(0).toInt(), 0); + QCOMPARE(spy.at(0).at(1).value(), + PSetCallBarringWrapper::BarringTypeAllBarrings); + QCOMPARE(spy.at(0).at(2).value(), + PSetCallBarringWrapper::BarringStatusNotProvisioned); + QCOMPARE(spy.at(0).at(3).toBool(), false); +} + + +/*! + UT_PSetCallBarringWrapper::t_RequestStatusChanged + */ +void UT_PSetCallBarringWrapper::t_RequestStatusChanged() +{ + m_wrapper->m_privateImpl->RequestStatusChanged(0); +} + + +/*! + UT_PSetCallBarringWrapper::t_exceptionSafety + */ +void UT_PSetCallBarringWrapper::t_exceptionSafety() +{ + cleanup(); + + OomTestExecuter::runAllTests(*this, "t_exceptionSafety"); +} + + +/*! + UT_PSetCallBarringWrapper::simulateLeaveAtMockMethodCall + */ +void UT_PSetCallBarringWrapper::simulateLeaveAtMockMethodCall() +{ + User::Leave(KErrGeneral); +} + +QTEST_MAIN_S60(UT_PSetCallBarringWrapper) diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,73 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef UT_PSETCALLBARRINGWRAPPER_H +#define UT_PSETCALLBARRINGWRAPPER_H + +#include +#include + +class CPsetContainer; +class PSetCallBarringWrapper; + +class UT_PSetCallBarringWrapper : public QObject, public MockService +{ + Q_OBJECT + +public: + + UT_PSetCallBarringWrapper(); + ~UT_PSetCallBarringWrapper(); + +private slots: + + void init(); + void cleanup(); + + void t_construction(); + void t_barringStatus(); + void t_barringStatusExceptionOccurs(); + void t_enableBarring(); + void t_disableBarring(); + + // private implementation tests + void t_HandleBarringModeStatusL(); + void t_HandleBarringModeStatusNoBasicServiceGroupIdsL(); + + void t_HandleBarringModeChangedL(); + void t_HandleBarringErrorL(); + void t_HandleCBRequestingL(); + void t_SetEngineContact(); + void t_CbPasswordChangedL(); + + void t_enableBarringRequestComplete(); + void t_disableBarringRequestComplete(); + void t_RequestStatusChanged(); + + void t_exceptionSafety(); + +private: + + void simulateLeaveAtMockMethodCall(); + +private: + + CPsetContainer *m_psetContainerMock; + PSetCallBarringWrapper* m_wrapper; +}; + +#endif // UT_PSETCALLBARRINGWRAPPER_H diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.pro Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,52 @@ +# +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: Project file for building unit test component +# +# + +CONFIG += qtestlib release +TEMPLATE = app +TARGET = +DEPENDPATH += . ../../src/ +INCLUDEPATH += . ../../../ ../common +DEFINES += BUILD_PSETWRAPPER +DEFINES += QT_NO_DEBUG_STREAM + +MOC_DIR = . + +QT -= gui +QT += testlib + +symbian: { + CONFIG += no_icon + INCLUDEPATH += /epoc32/include/mw/QtTest \ + /epoc32/include/platform/mw \ + /epoc32/include/mw/qt + LIBS += -lmocklib -lsymbianmock -letelmm -letel -lbafl -lcustomapi +} + +# test code +HEADERS += ut_psetcallbarringwrapper.h +HEADERS += ../common/testutilities.h +SOURCES += ut_psetcallbarringwrapper.cpp +SOURCES += ../common/testutilities.cpp + +# code to be tested +HEADERS += ../../../../../../phonesrv_plat/phone_settings_api/inc/psetcallbarringwrapper.h +SOURCES += ../../src/psetcallbarringwrapper.cpp \ + ../../src/psetcallbarringwrapper_p.cpp + +# mocks needed for testing +SOURCES += ../mocks/mock_psetcontainer.cpp \ + ../mocks/mock_psetcallbarring.cpp diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ #include #include -#include +#include #include "ut_psetcalldivertingwrapper.h" #include "mock_cphcltemergencycall.h" #include "testutilities.h" @@ -58,6 +58,11 @@ } }; +void SimulateLeaveL() +{ + User::Leave(KErrGeneral); +} + /*! UT_PSetCallDivertingWrapper::UT_PSetWrapperCallDiverting */ @@ -114,6 +119,34 @@ } /*! + UT_PSetCallDivertingWrapper::t_construction + */ +void UT_PSetCallDivertingWrapper::t_construction() +{ + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") != 0) { + + expect("CPsetContainer::CreateCFObjectL"). + willOnce(invokeWithoutArguments(SimulateLeaveL)); + PSetCallDivertingWrapper *wrapper = NULL; + EXPECT_EXCEPTION( + wrapper = new PSetCallDivertingWrapper(*mSetContainerMock, NULL); + delete wrapper; + wrapper = NULL; + ) + QVERIFY(verify()); + + expect("CPhCltEmergencyCallMock::NewL"). + willOnce(invokeWithoutArguments(SimulateLeaveL)); + EXPECT_EXCEPTION( + wrapper = new PSetCallDivertingWrapper(*mSetContainerMock, NULL); + delete wrapper; + wrapper = NULL; + ) + QVERIFY(verify()); + } +} + +/*! UT_PSetCallDivertingWrapper::t_setCallDivertingWithValidParameters */ void UT_PSetCallDivertingWrapper::t_setCallDivertingWithValidParameters() @@ -312,6 +345,12 @@ QString defNumber = "444444"; mWrapper->setNewDefaultNumber(defNumber); + expect("CPsetCallDiverting::GetDefaultNumbersL") + .willOnce(invoke(SimulateLeaveL)); + EXPECT_EXCEPTION( + mWrapper->setNewDefaultNumber(defNumber); + ) + QVERIFY(true == verify()); } @@ -320,26 +359,51 @@ */ void UT_PSetCallDivertingWrapper::t_getVoiceMailBoxNumber() { - // Fail case + // Fail case #1, illegal argument + QString defNumber; expect("CVoiceMailbox::GetStoredEntry").returns(-2).times(1); + mWrapper->getVoiceMailBoxNumber(defNumber); - QString defNumber; + // Fail case #2, New number not given. + expect("CVoiceMailbox::GetStoredEntry").returns(-1).times(1); + expect("CVoiceMailbox::QueryNewEntry").returns(-5).times(1); + mWrapper->getVoiceMailBoxNumber(defNumber); + + // Fail case #3, 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); - QVERIFY(true == verify()); -} + // ok case#2, 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); -/*! - UT_PSetCallDivertingWrapper::t_getVoiceMailBoxNumber2 - */ -void UT_PSetCallDivertingWrapper::t_getVoiceMailBoxNumber2() -{ + // ok case#1, number ok expect("CVoiceMailbox::GetStoredEntry").times(1); - expect("CVoiceMailboxEntry::GetVmbxNumber").returns(-1).times(1); - - QString defNumber; + 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("CVoiceMailbox::NewL") + .willOnce(invoke(SimulateLeaveL)); + EXPECT_EXCEPTION( + mWrapper->getVoiceMailBoxNumber(defNumber); + ) + QVERIFY(true == verify()); } @@ -606,33 +670,12 @@ /*! UT_PSetCallDivertingWrapper::t_exceptionSafety - TODO: tests using signalspy fail in alloc failure mode because - QList is not exception safe in QT 4.6.0. */ void UT_PSetCallDivertingWrapper::t_exceptionSafety() { cleanup(); - OomTestExecuter::runTest(*this, &t_setCallDivertingWithValidParameters); - //OomTestExecuter::runTest(*this, &t_setCallDivertingWithInvalidNumber); - //OomTestExecuter::runTest(*this, &t_setCallDivertingWithEmergencyNumber); - OomTestExecuter::runTest(*this, &t_setCallDivertingException); - OomTestExecuter::runTest(*this, &t_getCallDivertingStatus); - OomTestExecuter::runTest(*this, &t_getCallDivertingStatusException); - OomTestExecuter::runTest(*this, &t_cancelProcess); - OomTestExecuter::runTest(*this, &t_getDefaultNumbers); - OomTestExecuter::runTest(*this, &t_getDefaultNumbersException); - OomTestExecuter::runTest(*this, &t_setNewDefaultNumber); - OomTestExecuter::runTest(*this, &t_swapDefaultNumber); - //OomTestExecuter::runTest(*this, &t_handleDivertingChanged); - //OomTestExecuter::runTest(*this, &t_handleDivertingStatus); - //OomTestExecuter::runTest(*this, &t_handleDivertingError); - //OomTestExecuter::runTest(*this, &t_handleCFRequesting); - OomTestExecuter::runTest(*this, &t_setEngineContact); - OomTestExecuter::runTest(*this, &t_handleEmergencyDial); - OomTestExecuter::runTest(*this, &t_convertPsCallDivertingCondition); - OomTestExecuter::runTest(*this, &t_convertPsCallDivertingStatus); - OomTestExecuter::runTest(*this, &t_convertPsCallDivertingSetting); + OomTestExecuter::runAllTests(*this, "t_exceptionSafety"); } /*! diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -37,6 +37,7 @@ void init(); void cleanup(); + void t_construction(); void t_setCallDivertingWithValidParameters(); void t_setCallDivertingWithInvalidNumber(); @@ -51,7 +52,6 @@ void t_getDefaultNumbersException(); void t_setNewDefaultNumber(); void t_getVoiceMailBoxNumber(); - void t_getVoiceMailBoxNumber2(); void t_swapDefaultNumber(); // tests for private implementation diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallwaitingwrapper/ut_psetcallwaitingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallwaitingwrapper/ut_psetcallwaitingwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallwaitingwrapper/ut_psetcallwaitingwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ #include #include -#include +#include #include "ut_psetcallwaitingwrapper.h" #include "testutilities.h" #define private public @@ -63,6 +63,11 @@ } }; +void SimulateLeaveL() +{ + User::Leave(KErrGeneral); +} + /*! UT_PSetCallWaitingWrapper::UT_PSetCallWaitingWrapper */ @@ -122,6 +127,27 @@ m_wrapper = NULL; } + +/*! + UT_PSetCallWaitingWrapper::t_construction + */ +void UT_PSetCallWaitingWrapper::t_construction() +{ + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") != 0) { + expect("CPsetContainer::CreateCWObjectL"). + willOnce(invokeWithoutArguments(SimulateLeaveL)); + + PSetCallWaitingWrapper *wrapper = NULL; + EXPECT_EXCEPTION( + wrapper = new PSetCallWaitingWrapper(*m_psetContainerMock, NULL); + ) + delete wrapper; + + QVERIFY(verify()); + } +} + + /*! UT_PSetCallWaitingWrapper::t_setCallWaiting */ @@ -305,21 +331,12 @@ /*! UT_PSetCallWaitingWrapper::t_exceptionSafety - TODO: tests using signalspy fail in alloc failure mode because - QList is not exception safe in QT 4.6.0. */ void UT_PSetCallWaitingWrapper::t_exceptionSafety() { cleanup(); - OomTestExecuter::runTest(*this, &t_setCallWaiting); - OomTestExecuter::runTest(*this, &t_getCallWaitingStatus); - OomTestExecuter::runTest(*this, &t_cancelProcess); - //OomTestExecuter::runTest(*this, &t_handleCallWaitingGetStatus); - //OomTestExecuter::runTest(*this, &t_handleCallWaitingChanged); - //OomTestExecuter::runTest(*this, &t_handleCallWaitingRequesting); - //OomTestExecuter::runTest(*this, &t_handleCallWaitingError); - OomTestExecuter::runTest(*this, &t_setEngineContact); + OomTestExecuter::runAllTests(*this, "t_exceptionSafety"); } void UT_PSetCallWaitingWrapper::SimulateLeaveAtMockMethodCallL() diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallwaitingwrapper/ut_psetcallwaitingwrapper.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallwaitingwrapper/ut_psetcallwaitingwrapper.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallwaitingwrapper/ut_psetcallwaitingwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -38,7 +38,8 @@ void init(); void cleanup(); - + + void t_construction(); void t_setCallWaiting(); void t_getCallWaitingStatus(); void t_cancelProcess(); diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcliwrapper/ut_psetcliwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcliwrapper/ut_psetcliwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcliwrapper/ut_psetcliwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,10 +16,10 @@ */ #include -#include +#include #include #include -#include +#include #include "ut_psetcliwrapper.h" #include "testutilities.h" #define private public @@ -62,6 +62,12 @@ } }; +void SimulateLeaveL() +{ + User::Leave(KErrGeneral); +} + + /*! UT_PSetCliWrapper::UT_PSetCliWrapper */ @@ -121,6 +127,25 @@ } /*! + UT_PSetCliWrapper::t_construction + */ +void UT_PSetCliWrapper::t_construction() +{ + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") != 0) { + expect("CPsetContainer::CreateCliObjectL"). + willOnce(invokeWithoutArguments(SimulateLeaveL)); + + PSetCliWrapper *wrapper = NULL; + EXPECT_EXCEPTION( + wrapper = new PSetCliWrapper(*m_psetContainerMock, NULL); + ) + delete wrapper; + + QVERIFY(verify()); + } +} + +/*! UT_PSetCliWrapper::t_getColpMode */ void UT_PSetCliWrapper::t_getColpMode() @@ -329,19 +354,7 @@ { cleanup(); - OomTestExecuter::runTest(*this, &t_getColpMode); - OomTestExecuter::runTest(*this, &t_getClipMode); - OomTestExecuter::runTest(*this, &t_getClirMode); - OomTestExecuter::runTest(*this, &t_getColrMode); - OomTestExecuter::runTest(*this, &t_getCnap); - OomTestExecuter::runTest(*this, &t_cancelAll); - -// OomTestExecuter::runTest(*this, &t_handleCliRequesting); -// OomTestExecuter::runTest(*this, &t_cliInformation); -// OomTestExecuter::runTest(*this, &t_handleCliStatus); -// OomTestExecuter::runTest(*this, &t_handleCnapStatus); -// OomTestExecuter::runTest(*this, &t_handleCliError); -// OomTestExecuter::runTest(*this, &t_setEngineContact); + OomTestExecuter::runAllTests(*this, "t_exceptionSafety"); } void UT_PSetCliWrapper::SimulateLeaveAtMockMethodCallL() diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcliwrapper/ut_psetcliwrapper.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcliwrapper/ut_psetcliwrapper.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcliwrapper/ut_psetcliwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -39,6 +39,7 @@ void init(); void cleanup(); + void t_construction(); void t_getColpMode(); void t_getClipMode(); void t_getClirMode(); diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetnetworkwrapper/ut_psetnetworkwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetnetworkwrapper/ut_psetnetworkwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetnetworkwrapper/ut_psetnetworkwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,7 +16,8 @@ */ #include -#include +#include +#include #include "ut_psetnetworkwrapper.h" #include "testutilities.h" #define private public @@ -88,6 +89,11 @@ } }; +void SimulateLeaveL() +{ + User::Leave(KErrGeneral); +} + /*! UT_PSetNetworkWrapper::UT_PSetNetworkWrapper */ @@ -156,15 +162,46 @@ } /*! + UT_PSetNetworkWrapper::t_construction + */ +void UT_PSetNetworkWrapper::t_construction() +{ + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") != 0) { + + expect("CPsetContainer::CreateNetworkObjectL"). + willOnce(invokeWithoutArguments(SimulateLeaveL)); + PSetNetworkWrapper *wrapper = NULL; + EXPECT_EXCEPTION( + wrapper = new PSetNetworkWrapper(*m_psetContainerMock, NULL); + delete wrapper; + wrapper = NULL; + ) + QVERIFY(verify()); + + expect("CPsetContainer::CreateNetworkModeObjectL"). + willOnce(invokeWithoutArguments(SimulateLeaveL)); + EXPECT_EXCEPTION( + wrapper = new PSetNetworkWrapper(*m_psetContainerMock, NULL); + delete wrapper; + wrapper = NULL; + ) + QVERIFY(verify()); + } +} + +/*! UT_PSetNetworkWrapper::t_getAvailableNetworks */ void UT_PSetNetworkWrapper::t_getAvailableNetworks() { - expect("CPsetNetwork::GetAvailableNetworksL"); + expect("CPsetNetwork::GetAvailableNetworksL") + .willOnce(invokeWithoutArguments(SimulateLeaveL)); - m_wrapper->getAvailableNetworks(); + EXPECT_EXCEPTION( + m_wrapper->getAvailableNetworks(); + ) - QVERIFY(true == verify()); + QVERIFY(verify()); } @@ -196,10 +233,13 @@ */ void UT_PSetNetworkWrapper::t_selectNetwork() { - expect("CPsetNetwork::SelectNetworkL"); - + expect("CPsetNetwork::SelectNetworkL") + .willOnce(invokeWithoutArguments(SimulateLeaveL)); + PSetNetworkWrapper::NetworkInfo info; - m_wrapper->selectNetwork(info); + EXPECT_EXCEPTION( + m_wrapper->selectNetwork(info); + ) QVERIFY(true == verify()); } @@ -221,9 +261,12 @@ */ void UT_PSetNetworkWrapper::t_getNetworkAccessMode() { - expect("CPsetNetwork::GetCurrentNetworkModeSelectionL"); + expect("CPsetNetwork::GetCurrentNetworkModeSelectionL") + .willOnce(invokeWithoutArguments(SimulateLeaveL)); - m_wrapper->getNetworkAccessMode(); + EXPECT_EXCEPTION( + m_wrapper->getNetworkAccessMode(); + ) QVERIFY(true == verify()); } @@ -237,12 +280,15 @@ with(RMmCustomAPI::KCapsNetworkModeDual); expect("CPsetNetwork::SetNetworkModeSelectionL"). with(RMmCustomAPI::KCapsNetworkModeUmts); - expect("CPsetNetwork::SetNetworkModeSelectionL"). - with(RMmCustomAPI::KCapsNetworkModeGsm); + expect("CPsetNetwork::SetNetworkModeSelectionL") + .with(RMmCustomAPI::KCapsNetworkModeGsm) + .willOnce(invokeWithoutArguments(SimulateLeaveL)); m_wrapper->setNetworkAccessMode(PSetNetworkWrapper::AccessModeDual); m_wrapper->setNetworkAccessMode(PSetNetworkWrapper::AccessModeUmts); - m_wrapper->setNetworkAccessMode(PSetNetworkWrapper::AccessModeGsm); + EXPECT_EXCEPTION( + m_wrapper->setNetworkAccessMode(PSetNetworkWrapper::AccessModeGsm); + ) const int invalidMode = -1; m_wrapper->setNetworkAccessMode( @@ -263,7 +309,13 @@ HandleNetworkInfoReceivedL(infos, KErrNone)); QVERIFY(KErrArgument == result); - infos = reinterpret_cast(this); + const TInt KGranularity = 2; + infos = new CNetworkInfoArray(KGranularity); + QScopedPointer infoArrayGuard(infos); + MPsetNetworkSelect::TNetworkInfo info1; + MPsetNetworkSelect::TNetworkInfo info2; + infos->AppendL(info1); + infos->AppendL(info2); TRAP(result, m_wrapper->m_privateImpl-> HandleNetworkInfoReceivedL(infos, KErrNone)); QVERIFY(KErrNone == result); @@ -337,25 +389,46 @@ /*! UT_PSetNetworkWrapper::t_handleNetworkErrorFromInfoObserver */ +Q_DECLARE_METATYPE(PSetNetworkWrapper::RequestType) +Q_DECLARE_METATYPE(PSetNetworkWrapper::ErrorCode) void UT_PSetNetworkWrapper::t_handleNetworkErrorFromInfoObserver() { + qRegisterMetaType + ("PSetNetworkWrapper::RequestType"); + qRegisterMetaType + ("PSetNetworkWrapper::ErrorCode"); + QSignalSpy spy(m_wrapper, SIGNAL(networkReqestFailed( + PSetNetworkWrapper::ErrorCode, PSetNetworkWrapper::RequestType))); + MPsetNetworkInfoObserver::TServiceRequest request = MPsetNetworkInfoObserver::EServiceRequestNone; - QT_TRAP_THROWING(m_wrapper->m_privateImpl-> - HandleNetworkErrorL(request, KErrNone)); + QT_TRAP_THROWING(m_wrapper->m_privateImpl->HandleNetworkErrorL( + request, KErrGsmNetCauseCallActive)); + QT_TRAP_THROWING(m_wrapper->m_privateImpl->HandleNetworkErrorL( + request, KErrGsm0707NoNetworkService)); + QT_TRAP_THROWING(m_wrapper->m_privateImpl->HandleNetworkErrorL( + request, KErrGsmOfflineOpNotAllowed)); + QT_TRAP_THROWING(m_wrapper->m_privateImpl->HandleNetworkErrorL( + request, KErrGeneral)); + + QCOMPARE(spy.count(), 4); + QVERIFY(PSetNetworkWrapper::ErrCauseCallActive == + qvariant_cast(spy.at(0).at(0))); + QVERIFY(PSetNetworkWrapper::ErrNoNetworkService == + qvariant_cast(spy.at(1).at(0))); + QVERIFY(PSetNetworkWrapper::ErrOfflineOpNotAllowed == + qvariant_cast(spy.at(2).at(0))); + QVERIFY(PSetNetworkWrapper::ErrNoNetworkAccess == + qvariant_cast(spy.at(3).at(0))); } /*! UT_PSetNetworkWrapper::t_handleNetworkSystemModeEvents */ -Q_DECLARE_METATYPE(PSetNetworkWrapper::NetworkAccessMode) void UT_PSetNetworkWrapper::t_handleNetworkSystemModeEvents() { - qRegisterMetaType - ("PSetNetworkWrapper::NetworkAccessMode"); - QSignalSpy spy(m_wrapper, - SIGNAL(networkAccessModeGot(PSetNetworkWrapper::NetworkAccessMode))); + QSignalSpy spy(m_wrapper, SIGNAL(networkAccessModeGot(int))); MPsetNetworkModeObserver::TServiceRequest serviceRequest = MPsetNetworkModeObserver::EServiceRequestGetCurrentNetworkMode; @@ -375,14 +448,11 @@ QCOMPARE(spy.count(), 3); const QList &arguments0 = spy.at(0); - QVERIFY(PSetNetworkWrapper::AccessModeDual - == arguments0.at(0).value()); + QVERIFY(PSetNetworkWrapper::AccessModeDual == arguments0.at(0).toInt()); const QList &arguments1 = spy.at(1); - QVERIFY(PSetNetworkWrapper::AccessModeUmts - == arguments1.at(0).value()); + QVERIFY(PSetNetworkWrapper::AccessModeUmts == arguments1.at(0).toInt()); const QList &arguments2 = spy.at(2); - QVERIFY(PSetNetworkWrapper::AccessModeGsm - == arguments2.at(0).value()); + QVERIFY(PSetNetworkWrapper::AccessModeGsm == arguments2.at(0).toInt()); // TODO: test skeleton for switch cases not yet implemented serviceRequest = MPsetNetworkModeObserver::EServiceRequestNone; @@ -412,6 +482,8 @@ */ void UT_PSetNetworkWrapper::t_exceptionSafety() { + cleanup(); + OomTestExecuter::runAllTests(*this, "t_exceptionSafety"); } diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetnetworkwrapper/ut_psetnetworkwrapper.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetnetworkwrapper/ut_psetnetworkwrapper.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetnetworkwrapper/ut_psetnetworkwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -38,6 +38,7 @@ void init(); void cleanup(); + void t_construction(); void t_getAvailableNetworks(); void t_getNetworkSelectionMode(); void t_selectNetwork(); diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,6 +21,11 @@ #include "psetwrapper.h" #include "testutilities.h" +void SimulateLeaveL() +{ + User::Leave(KErrGeneral); +} + /*! UT_PSetWrapper::UT_PSetWrapper */ @@ -65,6 +70,24 @@ } /*! + UT_PSetWrapper::t_construction + */ +void UT_PSetWrapper::t_construction() +{ + if (qstrcmp(QTest::currentTestFunction(), "t_exceptionSafety") != 0) { + expect("CPsetContainer::NewL"). + willOnce(invokeWithoutArguments(SimulateLeaveL)); + + PSetWrapper *wrapper = NULL; + EXPECT_EXCEPTION(wrapper = new PSetWrapper(NULL); + ) + delete wrapper; + + QVERIFY(verify()); + } +} + +/*! UT_PSetWrapper::t_cliWrapper */ void UT_PSetWrapper::t_cliWrapper() @@ -105,6 +128,16 @@ } /*! + UT_PSetWrapper::t_callBarringWrapper + */ +void UT_PSetWrapper::t_callBarringWrapper() +{ + PSetCallBarringWrapper *wrapper = NULL; + wrapper = &m_setWrapper->callBarringWrapper(); + QVERIFY(wrapper == &m_setWrapper->callBarringWrapper()); +} + +/*! UT_PSetWrapper::t_exceptionSafety */ void UT_PSetWrapper::t_exceptionSafety() diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.h Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -37,11 +37,13 @@ void init(); void cleanup(); + void t_construction(); void t_cliWrapper(); void t_callWaitingWrapper(); void t_callDivertingWrapper(); void t_networkWrapper(); + void t_callBarringWrapper(); void t_exceptionSafety(); private: diff -r ae8abd0db65c -r e32024264ebb cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.pro --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.pro Fri Mar 19 09:40:14 2010 +0200 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetwrapper/ut_psetwrapper.pro Fri Apr 16 15:31:58 2010 +0300 @@ -46,7 +46,8 @@ ../../../../../../phonesrv_plat/phone_settings_api/inc/psetcalldivertingwrapper.h \ ../../../../../../phonesrv_plat/phone_settings_api/inc/psetcallwaitingwrapper.h \ ../../../../../../phonesrv_plat/phone_settings_api/inc/psetcliwrapper.h \ - ../../../../../../phonesrv_plat/phone_settings_api/inc/psetnetworkwrapper.h + ../../../../../../phonesrv_plat/phone_settings_api/inc/psetnetworkwrapper.h \ + ../../../../../../phonesrv_plat/phone_settings_api/inc/psetcallbarringwrapper.h SOURCES += ../../src/psetwrapper.cpp # mocks needed for testing @@ -54,4 +55,5 @@ ../mocks/mock_psetnetworkwrapper.cpp \ ../mocks/mock_psetcliwrapper.cpp \ ../mocks/mock_psetcallwaitingwrapper.cpp \ - ../mocks/mock_psetcalldivertingwrapper.cpp + ../mocks/mock_psetcalldivertingwrapper.cpp \ + ../mocks/mock_psetcallbarringwrapper.cpp diff -r ae8abd0db65c -r e32024264ebb convergedcallengine/callprovider/rom/callprovider.iby --- a/convergedcallengine/callprovider/rom/callprovider.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/convergedcallengine/callprovider/rom/callprovider.iby Fri Apr 16 15:31:58 2010 +0300 @@ -20,6 +20,6 @@ #define __CALLPROVIDER_IBY__ file=ABI_DIR\BUILD_DIR\callprovider.dll SHARED_LIB_DIR\callprovider.dll -data=ZSYSTEM\install\callprovider_stub.SIS System\Install\callprovider_stub.SIS +data=ZSYSTEM\install\callprovider_stub.sis System\Install\callprovider_stub.sis #endif // __CALLPROVIDER_IBY__ diff -r ae8abd0db65c -r e32024264ebb convergedcallengine/serviceselector/inc/cssiconfileprovider.h --- a/convergedcallengine/serviceselector/inc/cssiconfileprovider.h Fri Mar 19 09:40:14 2010 +0200 +++ b/convergedcallengine/serviceselector/inc/cssiconfileprovider.h Fri Apr 16 15:31:58 2010 +0300 @@ -76,4 +76,4 @@ #endif // C_SSICONFILEPROVIDER_H -// End of File \ No newline at end of file +// End of File diff -r ae8abd0db65c -r e32024264ebb convergedcallengine/spsettings/group/bld.inf --- a/convergedcallengine/spsettings/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/convergedcallengine/spsettings/group/bld.inf Fri Apr 16 15:31:58 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 ae8abd0db65c -r e32024264ebb group/bld.inf --- a/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -27,7 +27,5 @@ #include "../phonesrv_plat/group/bld.inf" #include "../phonesrv_pub/group/bld.inf" #include "../phonecmdhandler/group/bld.inf" -#include "../vmbx/group/bld.inf" - // End of File diff -r ae8abd0db65c -r e32024264ebb package_definition.xml --- a/package_definition.xml Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/CallUI/Rom/CallUI.iby --- a/phoneclientserver/CallUI/Rom/CallUI.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/CallUI/Rom/CallUI.iby Fri Apr 16 15:31:58 2010 +0300 @@ -20,10 +20,10 @@ #define __CALLUI_IBY__ REM CallUI Plugin -ECOM_PLUGIN(CaUiPlugin.dll,101F868E.rsc) +ECOM_PLUGIN(cauiplugin.dll,101f868e.rsc) REM CallUI Engine -file=ABI_DIR\BUILD_DIR\CaUiEngine.dll SHARED_LIB_DIR\CaUiEngine.dll +file=ABI_DIR\BUILD_DIR\cauiengine.dll SHARED_LIB_DIR\cauiengine.dll REM Enabler for exlipsing ROM binaries data=ZSYSTEM\install\callui_stub.sis system\install\callui_stub.sis diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/CallUI/Rom/CallUI_Variant.iby --- a/phoneclientserver/CallUI/Rom/CallUI_Variant.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/CallUI/Rom/CallUI_Variant.iby Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #define __CALLUI_VARIANT_IBY__ #ifdef __JAPAN_PREFIX_CHANGE -file=ABI_DIR\BUILD_DIR\DialUtils.dll SHARED_LIB_DIR\DialUtils.dll +file=ABI_DIR\BUILD_DIR\dialutils.dll SHARED_LIB_DIR\dialutils.dll #endif // __JAPAN_PREFIX_CHANGE #endif diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp --- a/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -36,7 +36,7 @@ _LIT( KCaUiNullResFile, "" ); // The library to be loaded. -_LIT( KCaUiLoadedLib, "CaUiEngine.dll" ); +_LIT( KCaUiLoadedLib, "cauiengine.dll" ); diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Group/DOSENPolicy.mmp --- a/phoneclientserver/EnPolicy/Group/DOSENPolicy.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Group/DOSENPolicy.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -27,11 +27,11 @@ TARGETTYPE DLL UID 0x101F86D1 0x101F86D2 -SOURCEPATH ../src/DosEnPolicy -SOURCE CDOSEmergencyNumberPolicy.cpp +SOURCEPATH ../src/dosenpolicy +SOURCE cdosemergencynumberpolicy.cpp -USERINCLUDE . ../Inc -USERINCLUDE ../inc/DosEnPolicy +USERINCLUDE . ../inc +USERINCLUDE ../inc/dosenpolicy MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE ../../../inc diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Group/SOSENPolicy.mmp --- a/phoneclientserver/EnPolicy/Group/SOSENPolicy.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Group/SOSENPolicy.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -27,15 +27,15 @@ TARGETTYPE DLL UID 0x101F86D1 0x101F86D3 -SOURCEPATH ../src/SosEnPolicy -SOURCE CSosEmergencyNumberPolicyManager.cpp -SOURCE CSosEmergencyNumberPolicyHandler.cpp -SOURCE CSosEnPolicyENListHandler.cpp -SOURCE CSosEnPolicySimStatusMonitor.cpp -SOURCE CSosEnPolicySatRefresh.cpp +SOURCEPATH ../src/sosenpolicy +SOURCE csosemergencynumberpolicymanager.cpp +SOURCE csosemergencynumberpolicyhandler.cpp +SOURCE csosenpolicyenlisthandler.cpp +SOURCE csosenpolicysimstatusmonitor.cpp +SOURCE csosenpolicysatrefresh.cpp -USERINCLUDE . ../Inc -USERINCLUDE ../inc/SosEnPolicy +USERINCLUDE . ../inc +USERINCLUDE ../inc/sosenpolicy MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE ../../../inc diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Group/bld.inf --- a/phoneclientserver/EnPolicy/Group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -22,9 +22,9 @@ PRJ_EXPORTS -../inc/CEmergencyNumberPolicy.h |../../../inc/CEmergencyNumberPolicy.h +../inc/cemergencynumberpolicy.h |../../../inc/cemergencynumberpolicy.h #ifdef __EN_POLICY_DOS -DosEnPolicy_stub.SIS /epoc32/data/z/system/install/DosEnPolicy_stub.SIS +dosenpolicy_stub.sis /epoc32/data/z/system/install/dosenpolicy_stub.sis #else sosenpolicy_stub.sis /epoc32/data/z/system/install/sosenpolicy_stub.sis #endif @@ -33,8 +33,8 @@ ../rom/enpolicy.iby CORE_MW_LAYER_IBY_EXPORT_PATH(enpolicy.iby) PRJ_MMPFILES -../Group/DOSENPolicy.mmp -../Group/SOSENPolicy.mmp +../group/dosenpolicy.mmp +../group/sosenpolicy.mmp PRJ_TESTMMPFILES // specify the .mmp files required for building any test programs here diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Inc/CEmergencyNumberPolicy.h --- a/phoneclientserver/EnPolicy/Inc/CEmergencyNumberPolicy.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Inc/CEmergencyNumberPolicy.h Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include #include -#include +#include // CONSTANTS const TUid KEnPolicyUid={ 0x101F86D1 }; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSOSEmergencyNumberPolicyHandler.h --- a/phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSOSEmergencyNumberPolicyHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSOSEmergencyNumberPolicyHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,9 +21,9 @@ #define CSOSEMERGENCYNUMBERPOLICYHANDLER_H // INCLUDES -#include "CSOSEmergencyNumberPolicyManager.h" -#include "CSosEnPolicySimStatusMonitor.h" -#include "CSosEnPolicyENListHandler.h" +#include "csosemergencynumberpolicymanager.h" +#include "csosenpolicysimstatusmonitor.h" +#include "csosenpolicyenlisthandler.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSosEnPolicyENListHandler.h --- a/phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSosEnPolicyENListHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSosEnPolicyENListHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES -#include "CSOSEmergencyNumberPolicyHandler.h" +#include "csosemergencynumberpolicyhandler.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSosEnPolicySimStatusMonitor.h --- a/phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSosEnPolicySimStatusMonitor.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Inc/SosEnPolicy/CSosEnPolicySimStatusMonitor.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES -#include "CSOSEmergencyNumberPolicyHandler.h" +#include "csosemergencynumberpolicyhandler.h" #include // CActive #include // RProperty diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Src/DosEnPolicy/CDOSEmergencyNumberPolicy.cpp --- a/phoneclientserver/EnPolicy/Src/DosEnPolicy/CDOSEmergencyNumberPolicy.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Src/DosEnPolicy/CDOSEmergencyNumberPolicy.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include "CDOSEmergencyNumberPolicy.h" +#include "cdosemergencynumberpolicy.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEmergencyNumberPolicyHandler.cpp --- a/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEmergencyNumberPolicyHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEmergencyNumberPolicyHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,14 +18,14 @@ // INCLUDE FILES -#include "CSOSEmergencyNumberPolicyHandler.h" +#include "csosemergencynumberpolicyhandler.h" #include #include #include #include #include #include -#include "CSosEnPolicySatRefresh.h" +#include "csosenpolicysatrefresh.h" // CONSTANTS // The default emergency numbers. diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEmergencyNumberPolicyManager.cpp --- a/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEmergencyNumberPolicyManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEmergencyNumberPolicyManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include "CSOSEmergencyNumberPolicyManager.h" -#include "CSOSEmergencyNumberPolicyHandler.h" +#include "csosemergencynumberpolicymanager.h" +#include "csosemergencynumberpolicyhandler.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicyENListHandler.cpp --- a/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicyENListHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicyENListHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDES -#include "CSosEnPolicyENListHandler.h" +#include "csosenpolicyenlisthandler.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp --- a/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,8 +20,8 @@ // INCLUDE FILES #include -#include "CSOSEmergencyNumberPolicyHandler.h" -#include "CSosEnPolicySatRefresh.h" +#include "csosemergencynumberpolicyhandler.h" +#include "csosenpolicysatrefresh.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySimStatusMonitor.cpp --- a/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySimStatusMonitor.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySimStatusMonitor.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDES -#include "CSosEnPolicySimStatusMonitor.h" +#include "csosenpolicysimstatusmonitor.h" #include // Property values -#include +#include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/EnPolicy/rom/enpolicy.iby --- a/phoneclientserver/EnPolicy/rom/enpolicy.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/EnPolicy/rom/enpolicy.iby Fri Apr 16 15:31:58 2010 +0300 @@ -20,11 +20,11 @@ #define __ENPOLICY_IBY__ #ifdef __EN_POLICY_DOS -file = ABI_DIR\BUILD_DIR\DOSENPOLICY.DLL SHARED_LIB_DIR\DOSENPOLICY.DLL -data=ZSYSTEM\install\DosEnPolicy_stub.sis system\install\DosEnPolicy_stub.sis +file = ABI_DIR\BUILD_DIR\dosenpolicy.dll SHARED_LIB_DIR\dosenpolicy.dll +data=ZSYSTEM\install\dosenpolicy_stub.sis system\install\dosenpolicy_stub.sis #else -file = ABI_DIR\BUILD_DIR\SOSENPOLICY.DLL SHARED_LIB_DIR\SOSENPOLICY.DLL -data=ZSYSTEM\install\SosEnPolicy_stub.sis system\install\SosEnPolicy_stub.sis +file = ABI_DIR\BUILD_DIR\sosenpolicy.dll SHARED_LIB_DIR\sosenpolicy.dll +data=ZSYSTEM\install\sosenpolicy_stub.sis system\install\sosenpolicy_stub.sis #endif #endif // __ENPOLICY_IBY__ diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/aiwdialdata/group/bld.inf --- a/phoneclientserver/aiwdialdata/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/aiwdialdata/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ ../inc/aiwinternaldialdata.h |../../../inc/aiwinternaldialdata.h -../group/aiwdialdata_stub.SIS\ +../group/aiwdialdata_stub.sis\ /epoc32/data/z/system/install/aiwdialdata_stub.sis // IBY files diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/aiwdialdata/rom/aiwdialdata.iby --- a/phoneclientserver/aiwdialdata/rom/aiwdialdata.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/aiwdialdata/rom/aiwdialdata.iby Fri Apr 16 15:31:58 2010 +0300 @@ -20,6 +20,6 @@ #define __AIWDIALDATA_IBY__ file=ABI_DIR\BUILD_DIR\aiwdialdata.dll SHARED_LIB_DIR\aiwdialdata.dll -data=ZSYSTEM\install\aiwdialdata_stub.SIS System\Install\aiwdialdata_stub.SIS +data=ZSYSTEM\install\aiwdialdata_stub.sis System\Install\aiwdialdata_stub.sis #endif // __AIWDIALDATA_IBY__ diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/dialutils/src/DialUtilsFactImpl.cpp --- a/phoneclientserver/dialutils/src/DialUtilsFactImpl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/dialutils/src/DialUtilsFactImpl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,8 +19,8 @@ // INCLUDE FILES #include -#include "DialUtilsFactImpl.h" -#include "DialUtilsImpl.h" +#include "dialutilsfactimpl.h" +#include "dialutilsimpl.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/dialutils/src/DialUtilsImpl.cpp --- a/phoneclientserver/dialutils/src/DialUtilsImpl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/dialutils/src/DialUtilsImpl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include // Feature Manager. -#include "DialUtilsImpl.h" // Interface. +#include "dialutilsimpl.h" // Interface. #include // Central repository #include // Settings Central Repository keys. diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/src/DialUtilsTestsCases.cpp --- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/src/DialUtilsTestsCases.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/src/DialUtilsTestsCases.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #include #include "DialUtilsTests.h" -#include +#include // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/group/bld.inf --- a/phoneclientserver/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -16,13 +16,10 @@ */ -#include "../EnPolicy/Group/bld.inf" +#include "../enpolicy/group/bld.inf" #include "../aiwdialdata/group/bld.inf" #include "../dialutils/group/bld.inf" -#include "../phoneclient/Group/bld.inf" -#include "../phoneserver/Group/bld.inf" -// <-- QT PHONE START --> -//#include "../CallUI/Group/bld.inf" -// <-- QT PHONE END --> +#include "../phoneclient/group/bld.inf" +#include "../phoneserver/group/bld.inf" // End of File \ No newline at end of file diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Data/PhoneClient.rss --- a/phoneclientserver/phoneclient/Data/PhoneClient.rss Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Data/PhoneClient.rss Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ #include #include -#include "PhoneClient.hrh" +#include "phoneclient.hrh" #include "eikon.rsg" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Group/PhoneClient.mmp --- a/phoneclientserver/phoneclient/Group/PhoneClient.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Group/PhoneClient.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -28,68 +28,68 @@ TARGETTYPE dll UID 0x1000008d 0x1000084F -SOURCEPATH ../src/notifier/Notifier_Aiw -SOURCE CPhCltCallNotify.cpp -SOURCE RPhCltCallNotify.cpp +SOURCEPATH ../src/notifier/notifier_aiw +SOURCE cphcltcallnotify.cpp +SOURCE rphcltcallnotify.cpp SOURCE cphcltdialrequestmonitor.cpp SOURCE cphcltdialemergencyrequestmonitor.cpp SOURCE cphcltcomhandrequestmonitor.cpp -SOURCEPATH ../src/extcall/ExtCall_Aiw -SOURCE RPhCltExtCall.cpp -SOURCE CPhCltExtPhoneDialData.cpp +SOURCEPATH ../src/extcall/extcall_aiw +SOURCE rphcltextcall.cpp +SOURCE cphcltextphonedialdata.cpp SOURCE cphcltdialdata.cpp -SOURCEPATH ../src/extcallwrapper/ExtCallWrapper_Aiw -SOURCE CPhCltExtPhone.cpp -SOURCE CPhCltExtPhoneBase.cpp +SOURCEPATH ../src/extcallwrapper/extcallwrapper_aiw +SOURCE cphcltextphone.cpp +SOURCE cphcltextphonebase.cpp SOURCEPATH ../src/ussd/ussd_ext SOURCE rphcltussd.cpp -SOURCEPATH ../src/UssdWrapper -SOURCE CPhCltUssdRequestHandler.cpp +SOURCEPATH ../src/ussdwrapper +SOURCE cphcltussdrequesthandler.cpp -SOURCE CPhCltUssdSatClient.cpp +SOURCE cphcltussdsatclient.cpp -SOURCE CPhCltUssdInt.cpp -SOURCE CPhCltUssdImp.cpp -SOURCE CPhCltUssdExt.cpp +SOURCE cphcltussdint.cpp +SOURCE cphcltussdimp.cpp +SOURCE cphcltussdext.cpp -SOURCE CPhCltUssdNoteController.cpp +SOURCE cphcltussdnotecontroller.cpp -SOURCEPATH ../src/emergencynumber/EmergencyNumber_Aiw -SOURCE CPhCltEmergencyCall.cpp -SOURCE RPhCltEmergencyCall.cpp -SOURCE CPhCltEmergencyCallImpl.cpp +SOURCEPATH ../src/emergencynumber/emergencynumber_aiw +SOURCE cphcltemergencycall.cpp +SOURCE rphcltemergencycall.cpp +SOURCE cphcltemergencycallimpl.cpp -SOURCEPATH ../src/Session -SOURCE RPhCltServer.cpp +SOURCEPATH ../src/session +SOURCE rphcltserver.cpp -SOURCEPATH ../Src -SOURCE PhCltUtils.cpp -SOURCE RPhCltResourceFile.cpp +SOURCEPATH ../src +SOURCE phcltutils.cpp +SOURCE rphcltresourcefile.cpp -SOURCEPATH ../src/CommandHandler -SOURCE CPhCltCommandHandler.cpp -SOURCE CPhCltComHandImplementation.cpp -SOURCE RPhCltCommandHandler.cpp -SOURCEPATH ../src/ImageHandler -SOURCE CPhCltImageHandler.cpp -SOURCE CPhCltBaseImageParams.cpp -SOURCE CPhCltOperatorLogoContainer.cpp -SOURCE CPhCltImageHandlerImplementation.cpp -SOURCE RPhCltImageHandler.cpp -SOURCEPATH ../src/Messenger -SOURCE CPhCltMessenger.cpp -SOURCE RPhCltMessenger.cpp -SOURCE CPhCltMessengerImplementation.cpp +SOURCEPATH ../src/commandhandler +SOURCE cphcltcommandhandler.cpp +SOURCE cphcltcomhandimplementation.cpp +SOURCE rphcltcommandhandler.cpp +SOURCEPATH ../src/imagehandler +SOURCE cphcltimagehandler.cpp +SOURCE cphcltbaseimageparams.cpp +SOURCE cphcltoperatorlogocontainer.cpp +SOURCE cphcltimagehandlerimplementation.cpp +SOURCE rphcltimagehandler.cpp +SOURCEPATH ../src/messenger +SOURCE cphcltmessenger.cpp +SOURCE rphcltmessenger.cpp +SOURCE cphcltmessengerimplementation.cpp -SOURCEPATH ../Src -START RESOURCE ../data/PhoneClient.rss +SOURCEPATH ../src +START RESOURCE ../data/phoneclient.rss HEADER TARGETPATH RESOURCE_FILES_DIR LANGUAGE_IDS @@ -98,21 +98,21 @@ MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE ../../../inc -USERINCLUDE ../inc/extcall/ExtCall_Aiw -USERINCLUDE ../inc/notifier/Notifier_Aiw -USERINCLUDE ../inc/extcallwrapper/ExtCallWrapper_Aiw -USERINCLUDE ../inc/emergencynumber/EmergencyNumber_Aiw +USERINCLUDE ../inc/extcall/extcall_aiw +USERINCLUDE ../inc/notifier/notifier_aiw +USERINCLUDE ../inc/extcallwrapper/extcallwrapper_aiw +USERINCLUDE ../inc/emergencynumber/emergencynumber_aiw -USERINCLUDE ../inc/Session -USERINCLUDE ../inc/SharedClientServer +USERINCLUDE ../inc/session +USERINCLUDE ../inc/sharedclientserver -USERINCLUDE ../inc/ussdwrapper/Ussd_Ext +USERINCLUDE ../inc/ussdwrapper/ussd_ext USERINCLUDE ../inc/ussd/ussd_ext -USERINCLUDE ../inc/CommandHandler -USERINCLUDE ../inc/ImageHandler -USERINCLUDE ../inc/Messenger -USERINCLUDE ../inc/UssdWrapper -USERINCLUDE ../Inc +USERINCLUDE ../inc/commandhandler +USERINCLUDE ../inc/imagehandler +USERINCLUDE ../inc/messenger +USERINCLUDE ../inc/ussdwrapper +USERINCLUDE ../inc LIBRARY euser.lib @@ -131,9 +131,9 @@ #ifdef WINSCW - DEFFILE ../Bwins/PHONECLIENT_AiwExt.DEF + DEFFILE ../bwins/phoneclient_aiwext.def #else - DEFFILE ../EABI/PHONECLIENT_AiwExt.DEF + DEFFILE ../eabi/phoneclient_aiwext.def #endif // End of File diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Group/bld.inf --- a/phoneclientserver/phoneclient/Group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -23,26 +23,26 @@ PRJ_EXPORTS - ../inc/emergencynumber/emergencynumber_aiw/RPhCltEmergencyCall.h |../../inc/RPhCltEmergencyCall.h + ../inc/emergencynumber/emergencynumber_aiw/rphcltemergencycall.h |../../inc/rphcltemergencycall.h ../inc/misc/telservicesinternalcrkeys.h |../../../inc/telservicesinternalcrkeys.h ../inc/misc/telservicesvariant.hrh |../../../inc/telservicesvariant.hrh - ../inc/extcall/extcall_aiw/CPhCltExtPhoneDialData.h |../../inc/CPhCltExtPhoneDialData.h - ../inc/extcallwrapper/extcallwrapper_aiw/MPhCltExtPhoneObserver.h |../../inc/MPhCltExtPhoneObserver.h - ../inc/extcallwrapper/extcallwrapper_aiw/CPhCltExtPhoneBase.h |../../inc/CPhCltExtPhoneBase.h - ../inc/extcallwrapper/extcallwrapper_aiw/CPhCltDialer.h |../../inc/CPhCltDialer.h + ../inc/extcall/extcall_aiw/cphcltextphonedialdata.h |../../inc/cphcltextphonedialdata.h + ../inc/extcallwrapper/extcallwrapper_aiw/mphcltextphoneobserver.h |../../inc/mphcltextphoneobserver.h + ../inc/extcallwrapper/extcallwrapper_aiw/cphcltextphonebase.h |../../inc/cphcltextphonebase.h + ../inc/extcallwrapper/extcallwrapper_aiw/cphcltdialer.h |../../inc/cphcltdialer.h -../data/Phoneclient_stub.SIS /epoc32/data/z/system/install/Phoneclient_stub.SIS +../data/phoneclient_stub.sis /epoc32/data/z/system/install/phoneclient_stub.sis // IBY files -../rom/PhoneClient.iby CORE_MW_LAYER_IBY_EXPORT_PATH(PhoneClient.iby) +../rom/phoneclient.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phoneclient.iby) // Generic configuration interface for component cenrep settings ../conf/telephonyservices.confml MW_LAYER_CONFML(telephonyservices.confml) -../conf/telephonyservices_102029AC.crml MW_LAYER_CRML(telephonyservices_102029AC.crml) -../conf/telephonyservices_102078F1.crml MW_LAYER_CRML(telephonyservices_102078F1.crml) +../conf/telephonyservices_102029ac.crml MW_LAYER_CRML(telephonyservices_102029ac.crml) +../conf/telephonyservices_102078f1.crml MW_LAYER_CRML(telephonyservices_102078f1.crml) PRJ_MMPFILES -../Group/PhoneClient.mmp +../group/phoneclient.mmp PRJ_TESTMMPFILES // specify the .mmp files required for building any test programs here diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/CommandHandler/CPhCltComHandImplementation.h --- a/phoneclientserver/phoneclient/Inc/CommandHandler/CPhCltComHandImplementation.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/CommandHandler/CPhCltComHandImplementation.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,8 +23,8 @@ // INCLUDES -#include "RPhCltCommandHandler.h" -#include "RPhCltCommandHandlerNotify.h" +#include "rphcltcommandhandler.h" +#include "rphcltcommandhandlernotify.h" #include "rphcltserver.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.h --- a/phoneclientserver/phoneclient/Inc/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ #include #include "rphcltserver.h" #include "cphcltemergencycall.h" -#include "RPhCltEmergencyCall.h" +#include "rphcltemergencycall.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhone.h --- a/phoneclientserver/phoneclient/Inc/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhone.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhone.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,9 +21,9 @@ // INCLUDES #include -#include "CPhCltExtPhoneBase.h" +#include "cphcltextphonebase.h" #include "rphcltserver.h" -#include "RPhCltExtCall.h" +#include "rphcltextcall.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/ImageHandler/CPhCltImageHandlerImplementation.h --- a/phoneclientserver/phoneclient/Inc/ImageHandler/CPhCltImageHandlerImplementation.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/ImageHandler/CPhCltImageHandlerImplementation.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include -#include "RPhCltImageHandler.h" +#include "rphcltimagehandler.h" #include "rphcltserver.h" /** diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/ImageHandler/RPhCltImageHandler.h --- a/phoneclientserver/phoneclient/Inc/ImageHandler/RPhCltImageHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/ImageHandler/RPhCltImageHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include #include -#include "CPhCltOperatorLogoContainer.h" +#include "cphcltoperatorlogocontainer.h" #include "cphcltbaseimageparams.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/Messenger/CPhCltMessengerImplementation.h --- a/phoneclientserver/phoneclient/Inc/Messenger/CPhCltMessengerImplementation.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/Messenger/CPhCltMessengerImplementation.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include -#include "RPhCltMessenger.h" +#include "rphcltmessenger.h" #include "rphcltserver.h" /** diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/UssdWrapper/CPhCltUssdNoteController.h --- a/phoneclientserver/phoneclient/Inc/UssdWrapper/CPhCltUssdNoteController.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/UssdWrapper/CPhCltUssdNoteController.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include -#include "MPhCltUssdNoteControllerCallBack.h" +#include "mphcltussdnotecontrollercallback.h" // FORWARD DECLARATIONS class CAknGlobalNote; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Inc/UssdWrapper/Ussd_Ext/CPhCltUssdImp.h --- a/phoneclientserver/phoneclient/Inc/UssdWrapper/Ussd_Ext/CPhCltUssdImp.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Inc/UssdWrapper/Ussd_Ext/CPhCltUssdImp.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,8 +21,8 @@ // INCLUDES #include -#include "MPhCltUssdRequestHandler.h" -#include "MPhCltUssdNoteControllerCallBack.h" +#include "mphcltussdrequesthandler.h" +#include "mphcltussdnotecontrollercallback.h" #include "rphcltussd.h" #include "rphcltserver.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/CommandHandler/CPhCltComHandImplementation.cpp --- a/phoneclientserver/phoneclient/Src/CommandHandler/CPhCltComHandImplementation.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/CommandHandler/CPhCltComHandImplementation.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "CPhCltComHandImplementation.h" +#include "cphcltcomhandimplementation.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/CommandHandler/CPhCltCommandHandler.cpp --- a/phoneclientserver/phoneclient/Src/CommandHandler/CPhCltCommandHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/CommandHandler/CPhCltCommandHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "cphcltcommandhandler.h" -#include "CPhCltComHandImplementation.h" +#include "cphcltcomhandimplementation.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/CommandHandler/RPhCltCommandHandler.cpp --- a/phoneclientserver/phoneclient/Src/CommandHandler/RPhCltCommandHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/CommandHandler/RPhCltCommandHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,10 +20,10 @@ // INCLUDES -#include "RPhCltCommandHandler.h" +#include "rphcltcommandhandler.h" #include #include -#include "PhCltClientServer.h" +#include "phcltclientserver.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCall.cpp --- a/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "cphcltemergencycall.h" -#include "CPhCltEmergencyCallImpl.h" +#include "cphcltemergencycallimpl.h" #include "phclttypes.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.cpp --- a/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "rphcltserver.h" -#include "CPhCltEmergencyCallImpl.h" +#include "cphcltemergencycallimpl.h" #include "mphcltemergencycallobserver.h" _LIT( KEmNumber, "112" ); diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/RPhCltEmergencyCall.cpp --- a/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/RPhCltEmergencyCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/RPhCltEmergencyCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,8 +19,8 @@ // INCLUDE FILES #include // for TPhCltEmergencyNumber -#include "RPhCltEmergencyCall.h" -#include "PhCltClientServer.h" +#include "rphcltemergencycall.h" +#include "phcltclientserver.h" #include "phcltutils.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/CPhCltExtPhoneDialData.cpp --- a/phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/CPhCltExtPhoneDialData.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/CPhCltExtPhoneDialData.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "CPhCltExtPhoneDialData.h" +#include "cphcltextphonedialdata.h" #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/RPhCltExtCall.cpp --- a/phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/RPhCltExtCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/RPhCltExtCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,9 +19,9 @@ // INCLUDE FILES #include "rphcltserver.h" -#include "RPhCltExtCall.h" -#include "CPhCltExtPhoneDialData.h" -#include "PhCltClientServer.h" +#include "rphcltextcall.h" +#include "cphcltextphonedialdata.h" +#include "phcltclientserver.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/cphcltdialdata.cpp --- a/phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/cphcltdialdata.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ExtCall/ExtCall_Aiw/cphcltdialdata.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include "CPhCltExtPhoneDialData.h" // For correct default values +#include "cphcltextphonedialdata.h" // For correct default values // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhone.cpp --- a/phoneclientserver/phoneclient/Src/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhone.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhone.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,9 +19,9 @@ // INCLUDE FILES #include -#include "MPhCltExtPhoneObserver.h" -#include "CPhCltExtPhone.h" -#include "CPhCltExtPhoneDialData.h" +#include "mphcltextphoneobserver.h" +#include "cphcltextphone.h" +#include "cphcltextphonedialdata.h" // LOCAL CONSTANTS AND MACROS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhoneBase.cpp --- a/phoneclientserver/phoneclient/Src/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhoneBase.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ExtCallWrapper/ExtCallWrapper_Aiw/CPhCltExtPhoneBase.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhCltExtPhoneBase.h" -#include "CPhCltExtPhone.h" +#include "cphcltextphonebase.h" +#include "cphcltextphone.h" #include "phclttypes.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ImageHandler/CPhCltBaseImageParams.cpp --- a/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltBaseImageParams.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltBaseImageParams.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ #include "cphcltbaseimageparams.h" -#include "PhCltClientServer.h" +#include "phcltclientserver.h" // ----------------------------------------------------------------------------- // CPhCltBaseImageParams::CPhCltBaseImageParams // diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ImageHandler/CPhCltImageHandler.cpp --- a/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltImageHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltImageHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "cphcltimagehandler.h" -#include "CPhCltImageHandlerImplementation.h" +#include "cphcltimagehandlerimplementation.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ImageHandler/CPhCltImageHandlerImplementation.cpp --- a/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltImageHandlerImplementation.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltImageHandlerImplementation.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "CPhCltImageHandlerImplementation.h" +#include "cphcltimagehandlerimplementation.h" #ifdef _DEBUG #define _DxPRINT( x ) RDebug::Print(_L( x ) ); diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ImageHandler/CPhCltOperatorLogoContainer.cpp --- a/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltOperatorLogoContainer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ImageHandler/CPhCltOperatorLogoContainer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include "CPhCltOperatorLogoContainer.h" +#include "cphcltoperatorlogocontainer.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/ImageHandler/RPhCltImageHandler.cpp --- a/phoneclientserver/phoneclient/Src/ImageHandler/RPhCltImageHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/ImageHandler/RPhCltImageHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDES -#include "RPhCltImageHandler.h" -#include "PhCltClientServer.h" +#include "rphcltimagehandler.h" +#include "phcltclientserver.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Messenger/CPhCltMessenger.cpp --- a/phoneclientserver/phoneclient/Src/Messenger/CPhCltMessenger.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Messenger/CPhCltMessenger.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "cphcltmessenger.h" -#include "CPhCltMessengerImplementation.h" +#include "cphcltmessengerimplementation.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Messenger/CPhCltMessengerImplementation.cpp --- a/phoneclientserver/phoneclient/Src/Messenger/CPhCltMessengerImplementation.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Messenger/CPhCltMessengerImplementation.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "CPhCltMessengerImplementation.h" +#include "cphcltmessengerimplementation.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Messenger/RPhCltMessenger.cpp --- a/phoneclientserver/phoneclient/Src/Messenger/RPhCltMessenger.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Messenger/RPhCltMessenger.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,9 +20,9 @@ // INCLUDES -#include "RPhCltMessenger.h" +#include "rphcltmessenger.h" #include -#include "PhCltClientServer.h" +#include "phcltclientserver.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/CPhCltCallNotify.cpp --- a/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/CPhCltCallNotify.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/CPhCltCallNotify.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -24,8 +24,8 @@ #include #include "rphcltserver.h" -#include "CPhCltExtPhoneDialData.h" -#include "RPhCltCallNotify.h" +#include "cphcltextphonedialdata.h" +#include "rphcltcallnotify.h" #include "cphcltdialrequestmonitor.h" #include "cphcltdialemergencyrequestmonitor.h" #include "cphcltcomhandrequestmonitor.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/RPhCltCallNotify.cpp --- a/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/RPhCltCallNotify.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/RPhCltCallNotify.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // Include Files -#include "RPhCltCallNotify.h" +#include "rphcltcallnotify.h" #include "rphcltserver.h" -#include "PhCltClientServer.h" +#include "phcltclientserver.h" // ============================= LOCAL FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltcomhandrequestmonitor.cpp --- a/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltcomhandrequestmonitor.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltcomhandrequestmonitor.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // Include Files #include "cphcltcomhandrequestmonitor.h" -#include "RPhCltCallNotify.h" +#include "rphcltcallnotify.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltdialemergencyrequestmonitor.cpp --- a/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltdialemergencyrequestmonitor.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltdialemergencyrequestmonitor.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ #include "cphcltdialemergencyrequestmonitor.h" #include #include "rphcltserver.h" -#include "RPhCltCallNotify.h" +#include "rphcltcallnotify.h" // ============================= LOCAL FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltdialrequestmonitor.cpp --- a/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltdialrequestmonitor.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Notifier/Notifier_Aiw/cphcltdialrequestmonitor.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,10 +22,10 @@ #include #include "rphcltserver.h" -#include "CPhCltExtPhoneDialData.h" +#include "cphcltextphonedialdata.h" #include "cphcltdialdata.h" #include "cphcltdialrequestmonitor.h" -#include "RPhCltCallNotify.h" +#include "rphcltcallnotify.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/RPhCltResourceFile.cpp --- a/phoneclientserver/phoneclient/Src/RPhCltResourceFile.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/RPhCltResourceFile.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include "RPhCltResourceFile.h" +#include "rphcltresourcefile.h" #include "ConeResLoader.h" -#include "PhCltClientServer.h" +#include "phcltclientserver.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Session/RPhCltServer.cpp --- a/phoneclientserver/phoneclient/Src/Session/RPhCltServer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Session/RPhCltServer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ #include #include "phclttypes.h" #include "rphcltserver.h" -#include "PhCltClientServer.h" +#include "phcltclientserver.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/Ussd/ussd_ext/rphcltussd.cpp --- a/phoneclientserver/phoneclient/Src/Ussd/ussd_ext/rphcltussd.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/Ussd/ussd_ext/rphcltussd.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "rphcltserver.h" #include "rphcltussd.h" -#include "PhCltClientServer.h" +#include "phcltclientserver.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdExt.cpp --- a/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdExt.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdExt.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include "CPhCltUssdImp.h" +#include "cphcltussdimp.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdImp.cpp --- a/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdImp.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdImp.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include "CPhCltUssdImp.h" -#include "CPhCltUssdRequestHandler.h" -#include "PhCltClientServer.h" +#include "cphcltussdimp.h" +#include "cphcltussdrequesthandler.h" +#include "phcltclientserver.h" #include #include @@ -38,8 +38,8 @@ #include #include -#include "MPhCltUssdNoteControllerCallBack.h" -#include "CPhCltUssdNoteController.h" +#include "mphcltussdnotecontrollercallback.h" +#include "cphcltussdnotecontroller.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdInt.cpp --- a/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdInt.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdInt.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "cphcltussdint.h" -#include "CPhCltUssdImp.h" +#include "cphcltussdimp.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdNoteController.cpp --- a/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdNoteController.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdNoteController.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ #include #include -#include "PhCltClientServer.h" -#include "CPhCltUssdNoteController.h" +#include "phcltclientserver.h" +#include "cphcltussdnotecontroller.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdRequestHandler.cpp --- a/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdRequestHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdRequestHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhCltUssdRequestHandler.h" -#include "MPhCltUssdRequestHandler.h" +#include "cphcltussdrequesthandler.h" +#include "mphcltussdrequesthandler.h" // ============================ MEMBER FUNCTIONS =============================== @@ -74,7 +74,7 @@ { Cancel(); - iUssdClient.CancelSend(); + //iUssdClient.CancelSend(); Fix to ou1cimx1#265402 iUssdClient.Close(); iPhClient.Close(); diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdSatClient.cpp --- a/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdSatClient.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdSatClient.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhCltUssdImp.h" -#include "PhCltClientServer.h" +#include "cphcltussdimp.h" +#include "phcltclientserver.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/rom/PhoneClient.iby --- a/phoneclientserver/phoneclient/rom/PhoneClient.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/rom/PhoneClient.iby Fri Apr 16 15:31:58 2010 +0300 @@ -20,6 +20,6 @@ #define __PHONECLIENT_IBY__ -file=ABI_DIR\BUILD_DIR\phoneclient.DLL SHARED_LIB_DIR\phoneclient.dll -data=ZSYSTEM\install\PhoneClient_stub.sis system\install\PhoneClient_stub.sis +file=ABI_DIR\BUILD_DIR\phoneclient.dll SHARED_LIB_DIR\phoneclient.dll +data=ZSYSTEM\install\phoneclient_stub.sis system\install\phoneclient_stub.sis #endif diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/tsrc/public/basic/CommandHandlerTests/src/CommandHandlerTestsCases.cpp --- a/phoneclientserver/phoneclient/tsrc/public/basic/CommandHandlerTests/src/CommandHandlerTestsCases.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/tsrc/public/basic/CommandHandlerTests/src/CommandHandlerTestsCases.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include "CommandHandlerTests.h" -#include +#include // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/tsrc/public/basic/EmergencyCallTests/inc/EmergencyCallTests.h --- a/phoneclientserver/phoneclient/tsrc/public/basic/EmergencyCallTests/inc/EmergencyCallTests.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/tsrc/public/basic/EmergencyCallTests/inc/EmergencyCallTests.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include "StifTestModule.h" #include -#include +#include // CONSTANTS //const ?type ?constant_var = ?constant; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/tsrc/public/basic/EmergencyCallTests/src/EmergencyCallTestsCases.cpp --- a/phoneclientserver/phoneclient/tsrc/public/basic/EmergencyCallTests/src/EmergencyCallTestsCases.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/tsrc/public/basic/EmergencyCallTests/src/EmergencyCallTestsCases.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include "EmergencyCallTests.h" -#include +#include // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneclient/tsrc/public/basic/ImageHandlerTests/src/ImageHandlerTestsCases.cpp --- a/phoneclientserver/phoneclient/tsrc/public/basic/ImageHandlerTests/src/ImageHandlerTestsCases.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneclient/tsrc/public/basic/ImageHandlerTests/src/ImageHandlerTestsCases.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,8 +19,8 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include "ImageHandlerTests.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Group/PhoneServer.mmp --- a/phoneclientserver/phoneserver/Group/PhoneServer.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Group/PhoneServer.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -33,85 +33,85 @@ UID 0x1000008d 0x10000850 SOURCEPATH . -START RESOURCE ../src/resources/PhoneServer.rss +START RESOURCE ../src/resources/phoneserver.rss HEADER TARGETPATH RESOURCE_FILES_DIR LANGUAGE_IDS END // RESOURCE -SOURCEPATH ../src/Standard -SOURCE PhSrvStartUp.cpp -SOURCE PhSrvSubSessionFactory.cpp -SOURCE PhSrvUtils.cpp +SOURCEPATH ../src/standard +SOURCE phsrvstartup.cpp +SOURCE phsrvsubsessionfactory.cpp +SOURCE phsrvutils.cpp -SOURCE CPhSrvScheduler.cpp -SOURCE CPhSrvServer.cpp -SOURCE CPhSrvSession.cpp -SOURCE CPhSrvResourceManager.cpp -SOURCE CPhSrvPhoneController.cpp -SOURCE CPhSrvEmergencyNumberManager.cpp +SOURCE cphsrvscheduler.cpp +SOURCE cphsrvserver.cpp +SOURCE cphsrvsession.cpp +SOURCE cphsrvresourcemanager.cpp +SOURCE cphsrvphonecontroller.cpp +SOURCE cphsrvemergencynumbermanager.cpp -SOURCE CPhSrvSubSessionBase.cpp -SOURCE CPhSrvSubSessionUssd.cpp +SOURCE cphsrvsubsessionbase.cpp +SOURCE cphsrvsubsessionussd.cpp -SOURCE PhSrvDebugInfo.cpp +SOURCE phsrvdebuginfo.cpp -SOURCEPATH ../src/standard/Standard_Aiw -SOURCE CPhCltExtPhoneDialData.cpp +SOURCEPATH ../src/standard/standard_aiw +SOURCE cphcltextphonedialdata.cpp SOURCE cphcltdialdata.cpp -SOURCE CPhSrvEmergencyRequestManager.cpp -SOURCE CPhSrvCallRequest.cpp -SOURCE CPhSrvCallRequestManager.cpp -SOURCE CPhSrvSubSessionNotifier.cpp -SOURCE CPhSrvSubSessionExtCall.cpp -SOURCE CPhSrvSubSessionEmergencyNum.cpp +SOURCE cphsrvemergencyrequestmanager.cpp +SOURCE cphsrvcallrequest.cpp +SOURCE cphsrvcallrequestmanager.cpp +SOURCE cphsrvsubsessionnotifier.cpp +SOURCE cphsrvsubsessionextcall.cpp +SOURCE cphsrvsubsessionemergencynum.cpp -SOURCEPATH ../src/ImageHandler -SOURCE CPhSrvSubSessionImageHandler.cpp +SOURCEPATH ../src/imagehandler +SOURCE cphsrvsubsessionimagehandler.cpp SOURCE cphsrvimagesaver.cpp -SOURCEPATH ../src/Ussd -SOURCE CPhSrvUssdReplyTimer.cpp -SOURCE CPhSrvUssdSendHandler.cpp -SOURCE CPhSrvUssdReceiveHandler.cpp -SOURCE CPhSrvUssdManager.cpp -SOURCE CPhSrvUssdNotifyNWRelease.cpp +SOURCEPATH ../src/ussd +SOURCE cphsrvussdreplytimer.cpp +SOURCE cphsrvussdsendhandler.cpp +SOURCE cphsrvussdreceivehandler.cpp +SOURCE cphsrvussdmanager.cpp +SOURCE cphsrvussdnotifynwrelease.cpp -SOURCEPATH ../src/CommandHandler +SOURCEPATH ../src/commandhandler #if defined( __AT_HANDLER ) -SOURCE CPhSrvSubSessionCommandHandler.cpp -SOURCE CPhSrvComHandRequest.cpp +SOURCE cphsrvsubsessioncommandhandler.cpp +SOURCE cphsrvcomhandrequest.cpp #else // No __AT_HANDLER defined, so stub version is used. SOURCE cphsrvsubsessioncommandhandlerstub.cpp SOURCE cphsrvsubsessioncommandhandlernotifystub.cpp #endif // __AT_HANDLER -SOURCEPATH ../src/commandhandler/Commandhandler_Aiw +SOURCEPATH ../src/commandhandler/commandhandler_aiw #if defined( __AT_HANDLER ) -SOURCE CPhSrvComHandRequestManager.cpp +SOURCE cphsrvcomhandrequestmanager.cpp #else // No __AT_HANDLER defined, so stub version is used. SOURCE cphsrvcomhandrequestmanagerstub.cpp #endif // __AT_HANDLER -SOURCEPATH ../src/Messenger +SOURCEPATH ../src/messenger #if defined( __CS_VIDEO_TELEPHONY ) -SOURCE CPhSrvMessengerObject.cpp -SOURCE CPhSrvMessengerRequestManager.cpp -SOURCE CPhSrvSubSessionMessenger.cpp +SOURCE cphsrvmessengerobject.cpp +SOURCE cphsrvmessengerrequestmanager.cpp +SOURCE cphsrvsubsessionmessenger.cpp #else // No __CS_VIDEO_TELEPHONY defined, so stub version is used. SOURCE cphsrvmessengerrequestmanagerstub.cpp SOURCE cphsrvsubsessionmessengerstub.cpp #endif // __CS_VIDEO_TELEPHONY -USERINCLUDE ../inc/Standard -USERINCLUDE ../inc/standard/Standard_Aiw -USERINCLUDE ../inc/Ussd -USERINCLUDE ../inc/CommandHandler -USERINCLUDE ../inc/Messenger -USERINCLUDE ../inc/ImageHandler +USERINCLUDE ../inc/standard +USERINCLUDE ../inc/standard/standard_aiw +USERINCLUDE ../inc/ussd +USERINCLUDE ../inc/commandhandler +USERINCLUDE ../inc/messenger +USERINCLUDE ../inc/imagehandler -USERINCLUDE ../../phoneclient/inc/SharedClientServer +USERINCLUDE ../../phoneclient/inc/sharedclientserver // <-- QT PHONE START--> MW_LAYER_SYSTEMINCLUDE diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Group/bld.inf --- a/phoneclientserver/phoneserver/Group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -25,16 +25,16 @@ backup_registration.xml z:/private/10000850/backup_registration.xml -Phoneserver_stub.SIS /epoc32/data/z/system/install/Phoneserver_stub.SIS +phoneserver_stub.sis /epoc32/data/z/system/install/phoneserver_stub.sis // IBY files -../rom/PhoneServer.iby CORE_MW_LAYER_IBY_EXPORT_PATH(PhoneServer.iby) +../rom/phoneserver.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phoneserver.iby) // LOC files -../loc/PhoneServer.loc MW_LAYER_LOC_EXPORT_PATH(PhoneServer.loc) +../loc/phoneserver.loc MW_LAYER_LOC_EXPORT_PATH(phoneserver.loc) PRJ_MMPFILES -../Group/PhoneServer.mmp +../group/phoneserver.mmp PRJ_TESTMMPFILES // specify the .mmp files required for building any test programs here diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/CommandHandler/CPhSrvComHandRequestManager.h --- a/phoneclientserver/phoneserver/Inc/CommandHandler/CPhSrvComHandRequestManager.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/CommandHandler/CPhSrvComHandRequestManager.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include -#include "MPhSrvComHandNegotiators.h" -#include "MPhSrvComHandInitiators.h" +#include "mphsrvcomhandnegotiators.h" +#include "mphsrvcomhandinitiators.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/CommandHandler/CPhSrvSubSessionCommandHandler.h --- a/phoneclientserver/phoneserver/Inc/CommandHandler/CPhSrvSubSessionCommandHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/CommandHandler/CPhSrvSubSessionCommandHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES -#include "CPhSrvSubSessionBase.h" +#include "cphsrvsubsessionbase.h" // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/CommandHandler/MPhSrvComHandInitiators.h --- a/phoneclientserver/phoneserver/Inc/CommandHandler/MPhSrvComHandInitiators.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/CommandHandler/MPhSrvComHandInitiators.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include "PhCltClientServer.h" +#include "phcltclientserver.h" #include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/ImageHandler/CPhSrvSubSessionImageHandler.h --- a/phoneclientserver/phoneserver/Inc/ImageHandler/CPhSrvSubSessionImageHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/ImageHandler/CPhSrvSubSessionImageHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ #define CPHSRVSUBSESSIONIMAGEHANDLER_H // INCLUDES -#include "CPhSrvSubSessionBase.h" +#include "cphsrvsubsessionbase.h" #include "cphsrvimagesaver.h" #include "mphsrvimagesaverobserver.h" #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Messenger/CPhSrvMessengerObject.h --- a/phoneclientserver/phoneserver/Inc/Messenger/CPhSrvMessengerObject.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Messenger/CPhSrvMessengerObject.h Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include -#include "PhSrvMessengerTypes.h" +#include "phsrvmessengertypes.h" #include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Messenger/CPhSrvMessengerRequestManager.h --- a/phoneclientserver/phoneserver/Inc/Messenger/CPhSrvMessengerRequestManager.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Messenger/CPhSrvMessengerRequestManager.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include "MPhSrvMessengerNegotiators.h" +#include "mphsrvmessengernegotiators.h" #include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Messenger/CPhSrvSubSessionMessenger.h --- a/phoneclientserver/phoneserver/Inc/Messenger/CPhSrvSubSessionMessenger.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Messenger/CPhSrvSubSessionMessenger.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES -#include "CPhSrvSubSessionBase.h" +#include "cphsrvsubsessionbase.h" #include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Messenger/MPhSrvMessengerNegotiators.h --- a/phoneclientserver/phoneserver/Inc/Messenger/MPhSrvMessengerNegotiators.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Messenger/MPhSrvMessengerNegotiators.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include "PhSrvMessengerTypes.h" +#include "phsrvmessengertypes.h" #include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/CPhSrvEmergencyNumberManager.h --- a/phoneclientserver/phoneserver/Inc/Standard/CPhSrvEmergencyNumberManager.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/CPhSrvEmergencyNumberManager.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include // cbase -#include "MPhSrvEmergencyNumberManager.h" // interface +#include "mphsrvemergencynumbermanager.h" // interface // FORWARD DECLARATIONS class MPhSrvPhoneInterface; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/CPhSrvPhoneController.h --- a/phoneclientserver/phoneserver/Inc/Standard/CPhSrvPhoneController.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/CPhSrvPhoneController.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include // ETel #include // CustomAPI -#include "MPhSrvPhoneInterface.h" // The interface class +#include "mphsrvphoneinterface.h" // The interface class // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/CPhSrvServer.h --- a/phoneclientserver/phoneserver/Inc/Standard/CPhSrvServer.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/CPhSrvServer.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,8 +21,8 @@ // INCLUDES -#include "MPhSrvPhoneInterface.h" -#include "PhCltClientServer.h" +#include "mphsrvphoneinterface.h" +#include "phcltclientserver.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/CPhSrvSession.h --- a/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSession.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSession.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include -#include "PhCltClientServer.h" +#include "phcltclientserver.h" // FORWARD DECLARATIONS class CPhSrvServer; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionBase.h --- a/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionBase.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionBase.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include "MPhSrvMessageProcessor.h" +#include "mphsrvmessageprocessor.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionExtCall.h --- a/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionExtCall.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionExtCall.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,8 +20,8 @@ // INCLUDES -#include "CPhSrvSubSessionBase.h" -#include +#include "cphsrvsubsessionbase.h" +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionUssd.h --- a/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionUssd.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/CPhSrvSubSessionUssd.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,8 +20,8 @@ // INCLUDES -#include "CPhSrvSubSessionBase.h" -#include "MPhSrvUssdMessageSentObserver.h" +#include "cphsrvsubsessionbase.h" +#include "mphsrvussdmessagesentobserver.h" // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/PhSrvDebugInfo.h --- a/phoneclientserver/phoneserver/Inc/Standard/PhSrvDebugInfo.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/PhSrvDebugInfo.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include // TInt, cbase -#include "KPhSrvConfigure.h" // Debugging feature defines +#include "kphsrvconfigure.h" // Debugging feature defines // MACROS //---------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvCallRequest.h --- a/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvCallRequest.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvCallRequest.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvCallRequestManager.h --- a/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvCallRequestManager.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvCallRequestManager.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,9 +22,9 @@ // INCLUDES #include -#include "MPhSrvObjectNegotiators.h" -#include "MPhSrvObjectInitiators.h" -#include +#include "mphsrvobjectnegotiators.h" +#include "mphsrvobjectinitiators.h" +#include // FORWARD DECLARATIONS class CPhSrvCallRequest; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.h --- a/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include -#include "MPhSrvEmergencyNegotiators.h" -#include "MPhSrvEmergencyInitiators.h" +#include "mphsrvemergencynegotiators.h" +#include "mphsrvemergencyinitiators.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvSubSessionEmergencyNum.h --- a/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvSubSessionEmergencyNum.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvSubSessionEmergencyNum.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES -#include "CPhSrvSubSessionBase.h" +#include "cphsrvsubsessionbase.h" // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvSubSessionNotifier.h --- a/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvSubSessionNotifier.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/CPhSrvSubSessionNotifier.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,12 +22,12 @@ // INCLUDES #include -#include +#include #include // for TPhCltEmergencyNumber -#include "CPhSrvSubSessionBase.h" -#include "MPhSrvEmergencyInitiators.h" -#include "MPhSrvObjectInitiators.h" -#include "MPhSrvComHandInitiators.h" +#include "cphsrvsubsessionbase.h" +#include "mphsrvemergencyinitiators.h" +#include "mphsrvobjectinitiators.h" +#include "mphsrvcomhandinitiators.h" // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/MPhSrvEmergencyNumberManager.h --- a/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/MPhSrvEmergencyNumberManager.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/MPhSrvEmergencyNumberManager.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,8 +20,8 @@ #define MPHSRVEMERGENCYNUMBERMANAGER_H // INCLUDES -#include "PhCltClientServer.h" -#include +#include "phcltclientserver.h" +#include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/MPhSrvObjectNegotiators.h --- a/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/MPhSrvObjectNegotiators.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Standard/Standard_Aiw/MPhSrvObjectNegotiators.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include // FORWARD DECLARATIONS class MPhSrvInitiatorCall; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Inc/Ussd/CPhSrvUssdManager.h --- a/phoneclientserver/phoneserver/Inc/Ussd/CPhSrvUssdManager.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Inc/Ussd/CPhSrvUssdManager.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,9 +21,9 @@ // INCLUDES #include // ETel -#include "PhCltClientServer.h" -#include "MPhSrvUssdNetworkObserver.h" -#include "MPhSrvUssdReplyTimerObserver.h" +#include "phcltclientserver.h" +#include "mphsrvussdnetworkobserver.h" +#include "mphsrvussdreplytimerobserver.h" #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/CommandHandler/CPhSrvComHandRequest.cpp --- a/phoneclientserver/phoneserver/Src/CommandHandler/CPhSrvComHandRequest.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/CommandHandler/CPhSrvComHandRequest.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhSrvComHandRequest.h" -#include "PhSrvUtils.h" +#include "cphsrvcomhandrequest.h" +#include "phsrvutils.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/CommandHandler/CPhSrvSubSessionCommandHandler.cpp --- a/phoneclientserver/phoneserver/Src/CommandHandler/CPhSrvSubSessionCommandHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/CommandHandler/CPhSrvSubSessionCommandHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,11 +20,11 @@ // INCLUDE FILES -#include "CPhSrvSubSessionCommandHandler.h" -#include "CPhSrvSession.h" -#include "CPhSrvServer.h" +#include "cphsrvsubsessioncommandhandler.h" +#include "cphsrvsession.h" +#include "cphsrvserver.h" #include -#include "MPhSrvComHandNegotiators.h" +#include "mphsrvcomhandnegotiators.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/CommandHandler/Commandhandler_Aiw/CPhSrvComHandRequestManager.cpp --- a/phoneclientserver/phoneserver/Src/CommandHandler/Commandhandler_Aiw/CPhSrvComHandRequestManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/CommandHandler/Commandhandler_Aiw/CPhSrvComHandRequestManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,12 +18,12 @@ // INCLUDES -#include "CPhSrvComHandRequestManager.h" -#include "CPhSrvComHandRequest.h" -#include "CPhSrvSubSessionBase.h" -#include "PhSrvUtils.h" -#include "CPhSrvServer.h" -#include "MPhSrvEmergencyNumberManager.h" +#include "cphsrvcomhandrequestmanager.h" +#include "cphsrvcomhandrequest.h" +#include "cphsrvsubsessionbase.h" +#include "phsrvutils.h" +#include "cphsrvserver.h" +#include "mphsrvemergencynumbermanager.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp --- a/phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,12 +19,12 @@ // INCLUDE FILES -#include "CPhSrvSubSessionImageHandler.h" -#include "CPhSrvSession.h" -#include "CPhSrvServer.h" +#include "cphsrvsubsessionimagehandler.h" +#include "cphsrvsession.h" +#include "cphsrvserver.h" #include #include -#include "PhSrvDebugInfo.h" +#include "phsrvdebuginfo.h" // CONSTANTS _LIT( KPhSrvImageDriveRom, "z:" ); diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Messenger/CPhSrvMessengerObject.cpp --- a/phoneclientserver/phoneserver/Src/Messenger/CPhSrvMessengerObject.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Messenger/CPhSrvMessengerObject.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,10 +18,10 @@ // INCLUDE FILES -#include "CPhSrvMessengerObject.h" -#include "CPhSrvSubSessionBase.h" -#include "CPhSrvSession.h" // Phone server session. -#include "PhSrvDebugInfo.h" +#include "cphsrvmessengerobject.h" +#include "cphsrvsubsessionbase.h" +#include "cphsrvsession.h" // Phone server session. +#include "phsrvdebuginfo.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Messenger/CPhSrvMessengerRequestManager.cpp --- a/phoneclientserver/phoneserver/Src/Messenger/CPhSrvMessengerRequestManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Messenger/CPhSrvMessengerRequestManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,12 +20,12 @@ // INCLUDES -#include "CPhSrvMessengerRequestManager.h" -#include "CPhSrvMessengerObject.h" -#include "CPhSrvSubSessionBase.h" -#include "PhSrvUtils.h" -#include "PhSrvMessengerTypes.h" -#include "PhSrvDebugInfo.h" +#include "cphsrvmessengerrequestmanager.h" +#include "cphsrvmessengerobject.h" +#include "cphsrvsubsessionbase.h" +#include "phsrvutils.h" +#include "phsrvmessengertypes.h" +#include "phsrvdebuginfo.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Messenger/CPhSrvSubSessionMessenger.cpp --- a/phoneclientserver/phoneserver/Src/Messenger/CPhSrvSubSessionMessenger.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Messenger/CPhSrvSubSessionMessenger.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,12 +20,12 @@ // INCLUDE FILES -#include "CPhSrvSubSessionMessenger.h" -#include "CPhSrvSession.h" -#include "CPhSrvServer.h" +#include "cphsrvsubsessionmessenger.h" +#include "cphsrvsession.h" +#include "cphsrvserver.h" #include -#include "MPhSrvMessengerNegotiators.h" -#include "PhSrvMessengerTypes.h" +#include "mphsrvmessengernegotiators.h" +#include "phsrvmessengertypes.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvEmergencyNumberManager.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvEmergencyNumberManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvEmergencyNumberManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,14 +18,14 @@ // INCLUDE FILES -#include "CPhSrvEmergencyNumberManager.h" -#include "MPhSrvPhoneInterface.h" -#include "PhSrvDebugInfo.h" +#include "cphsrvemergencynumbermanager.h" +#include "mphsrvphoneinterface.h" +#include "phsrvdebuginfo.h" #include // CONSTANTS -_LIT(KPhSrvDosEnPolicyLibName, "DosEnPolicy.dll"); // DOS emergency number policy -_LIT(KPhSrvSosEnPolicyLibName, "SosEnPolicy.dll"); // SOS emergency number policy +_LIT(KPhSrvDosEnPolicyLibName, "dosenpolicy.dll"); // DOS emergency number policy +_LIT(KPhSrvSosEnPolicyLibName, "sosenpolicy.dll"); // SOS emergency number policy // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvPhoneController.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvPhoneController.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvPhoneController.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "CPhSrvPhoneController.h" +#include "cphsrvphonecontroller.h" #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvResourceManager.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvResourceManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvResourceManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhSrvResourceManager.h" -#include "PhCltClientServer.h" +#include "cphsrvresourcemanager.h" +#include "phcltclientserver.h" #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvScheduler.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvScheduler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvScheduler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,8 +17,8 @@ // INCLUDE FILES -#include "CPhSrvScheduler.h" -#include "PhSrvUtils.h" +#include "cphsrvscheduler.h" +#include "phsrvutils.h" diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvServer.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvServer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvServer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,24 +17,24 @@ // INCLUDE FILES -#include "CPhSrvServer.h" -#include "CPhSrvSession.h" -#include "CPhSrvScheduler.h" -#include "CPhSrvUssdManager.h" -#include "CPhSrvResourceManager.h" -#include "CPhSrvPhoneController.h" -#include "CPhSrvCallRequestManager.h" -#include "CPhSrvEmergencyRequestManager.h" -#include "CPhSrvEmergencyNumberManager.h" +#include "cphsrvserver.h" +#include "cphsrvsession.h" +#include "cphsrvscheduler.h" +#include "cphsrvussdmanager.h" +#include "cphsrvresourcemanager.h" +#include "cphsrvphonecontroller.h" +#include "cphsrvcallrequestmanager.h" +#include "cphsrvemergencyrequestmanager.h" +#include "cphsrvemergencynumbermanager.h" -#include "PhSrvUtils.h" -#include "KPhSrvConfigure.h" // debugprints ON/OFF -#include "PhSrvDebugInfo.h" +#include "phsrvutils.h" +#include "kphsrvconfigure.h" // debugprints ON/OFF +#include "phsrvdebuginfo.h" -#include "MPhSrvComHandNegotiators.h" -#include "CPhSrvComHandRequestManager.h" -#include "MPhSrvMessengerNegotiators.h" -#include "CPhSrvMessengerRequestManager.h" +#include "mphsrvcomhandnegotiators.h" +#include "cphsrvcomhandrequestmanager.h" +#include "mphsrvmessengernegotiators.h" +#include "cphsrvmessengerrequestmanager.h" #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,11 +18,11 @@ // INCLUDE FILES -#include "CPhSrvServer.h" -#include "CPhSrvSession.h" -#include "CPhSrvSubSessionBase.h" -#include "PhSrvSubSessionFactory.h" -#include "PhCltClientServer.h" +#include "cphsrvserver.h" +#include "cphsrvsession.h" +#include "cphsrvsubsessionbase.h" +#include "phsrvsubsessionfactory.h" +#include "phcltclientserver.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvSubSessionBase.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvSubSessionBase.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvSubSessionBase.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include "CPhSrvSubSessionBase.h" -#include "CPhSrvSession.h" -#include "CPhSrvSubSessionNotifier.h" +#include "cphsrvsubsessionbase.h" +#include "cphsrvsession.h" +#include "cphsrvsubsessionnotifier.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/CPhSrvSubSessionUssd.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvSubSessionUssd.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvSubSessionUssd.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,15 +17,15 @@ // INCLUDE FILES -#include "CPhSrvSubSessionUssd.h" +#include "cphsrvsubsessionussd.h" #include // ETel -#include "PhSrvUtils.h" -#include "CPhSrvSession.h" -#include "CPhSrvServer.h" +#include "phsrvutils.h" +#include "cphsrvsession.h" +#include "cphsrvserver.h" -#include "CPhSrvUssdManager.h" +#include "cphsrvussdmanager.h" #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/PhSrvDebugInfo.cpp --- a/phoneclientserver/phoneserver/Src/Standard/PhSrvDebugInfo.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/PhSrvDebugInfo.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ #include // rdebug #include // file and FS #include // converter -#include "PhSrvDebugInfo.h" // this -#include "KPhSrvConfigure.h" // defines +#include "phsrvdebuginfo.h" // this +#include "kphsrvconfigure.h" // defines // Initialize diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/PhSrvStartUp.cpp --- a/phoneclientserver/phoneserver/Src/Standard/PhSrvStartUp.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/PhSrvStartUp.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,10 +18,10 @@ // INCLUDE FILES -#include "PhSrvStartUp.h" -#include "CPhSrvScheduler.h" -#include "CPhSrvServer.h" -#include "PhSrvUtils.h" +#include "phsrvstartup.h" +#include "cphsrvscheduler.h" +#include "cphsrvserver.h" +#include "phsrvutils.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/PhSrvSubSessionFactory.cpp --- a/phoneclientserver/phoneserver/Src/Standard/PhSrvSubSessionFactory.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/PhSrvSubSessionFactory.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,16 +19,16 @@ // INCLUDES -#include "PhCltClientServer.h" +#include "phcltclientserver.h" -#include "PhSrvSubSessionFactory.h" -#include "CPhSrvSubSessionNotifier.h" -#include "CPhSrvSubSessionExtCall.h" -#include "CPhSrvSubSessionUssd.h" -#include "CPhSrvSubSessionEmergencyNum.h" -#include "CPhSrvSubSessionCommandHandler.h" -#include "CPhSrvSubSessionMessenger.h" -#include "CPhSrvSubSessionImageHandler.h" +#include "phsrvsubsessionfactory.h" +#include "cphsrvsubsessionnotifier.h" +#include "cphsrvsubsessionextcall.h" +#include "cphsrvsubsessionussd.h" +#include "cphsrvsubsessionemergencynum.h" +#include "cphsrvsubsessioncommandhandler.h" +#include "cphsrvsubsessionmessenger.h" +#include "cphsrvsubsessionimagehandler.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/PhSrvUtils.cpp --- a/phoneclientserver/phoneserver/Src/Standard/PhSrvUtils.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/PhSrvUtils.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDES #include -#include "PhSrvUtils.h" +#include "phsrvutils.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhCltExtPhoneDialData.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhCltExtPhoneDialData.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhCltExtPhoneDialData.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvCallRequest.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvCallRequest.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvCallRequest.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhSrvCallRequest.h" -#include "PhSrvUtils.h" +#include "cphsrvcallrequest.h" +#include "phsrvutils.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvCallRequestManager.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvCallRequestManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvCallRequestManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,10 +18,10 @@ // INCLUDES -#include "CPhSrvCallRequestManager.h" -#include "CPhSrvCallRequest.h" -#include "CPhSrvSubSessionBase.h" -#include "PhSrvUtils.h" +#include "cphsrvcallrequestmanager.h" +#include "cphsrvcallrequest.h" +#include "cphsrvsubsessionbase.h" +#include "phsrvutils.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDES -#include "CPhSrvEmergencyRequestManager.h" -#include "CPhSrvSubSessionBase.h" -#include "PhSrvUtils.h" +#include "cphsrvemergencyrequestmanager.h" +#include "cphsrvsubsessionbase.h" +#include "phsrvutils.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionEmergencyNum.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionEmergencyNum.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionEmergencyNum.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,15 +18,15 @@ // INCLUDE FILES -#include "CPhSrvSubSessionEmergencyNum.h" +#include "cphsrvsubsessionemergencynum.h" #include #include -#include "CPhSrvSession.h" -#include "CPhSrvServer.h" -#include "MPhSrvPhoneInterface.h" -#include "MPhSrvEmergencyNumberManager.h" -#include "MPhSrvEmergencyNegotiators.h" -#include "PhSrvDebugInfo.h" +#include "cphsrvsession.h" +#include "cphsrvserver.h" +#include "mphsrvphoneinterface.h" +#include "mphsrvemergencynumbermanager.h" +#include "mphsrvemergencynegotiators.h" +#include "phsrvdebuginfo.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionExtCall.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionExtCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionExtCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,10 +17,10 @@ // INCLUDE FILES -#include "CPhSrvSubSessionExtCall.h" -#include "CPhSrvSession.h" -#include "CPhSrvServer.h" -#include "MPhSrvObjectNegotiators.h" +#include "cphsrvsubsessionextcall.h" +#include "cphsrvsession.h" +#include "cphsrvserver.h" +#include "mphsrvobjectnegotiators.h" // Hash mark _LIT( KPhoneHash, "#" ); diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionNotifier.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionNotifier.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvSubSessionNotifier.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,12 +19,12 @@ // INCLUDE FILES #include -#include "CPhSrvSubSessionNotifier.h" -#include "CPhSrvSession.h" -#include "CPhSrvServer.h" -#include "MPhSrvEmergencyNegotiators.h" -#include "MPhSrvObjectNegotiators.h" -#include "MPhSrvComHandNegotiators.h" +#include "cphsrvsubsessionnotifier.h" +#include "cphsrvsession.h" +#include "cphsrvserver.h" +#include "mphsrvemergencynegotiators.h" +#include "mphsrvobjectnegotiators.h" +#include "mphsrvcomhandnegotiators.h" // CONSTANTS // None. diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/cphcltdialdata.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/cphcltdialdata.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/cphcltdialdata.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include "CPhCltExtPhoneDialData.h" // For correct default values +#include "cphcltextphonedialdata.h" // For correct default values // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp --- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,16 +16,16 @@ */ // INCLUDE FILES -#include "CPhSrvUssdManager.h" -#include "PhSrvUtils.h" -#include "CPhSrvUssdSendHandler.h" -#include "CPhSrvUssdReceiveHandler.h" -#include "CPhSrvUssdNotifyNWRelease.h" -#include "CPhSrvResourceManager.h" -#include "CPhSrvUssdReplyTimer.h" -#include "MPhSrvUssdMessageSentObserver.h" -#include "MPhSrvPhoneInterface.h" -#include "CPhSrvUssdSessionCancelWaiter.h" +#include "cphsrvussdmanager.h" +#include "phsrvutils.h" +#include "cphsrvussdsendhandler.h" +#include "cphsrvussdreceivehandler.h" +#include "cphsrvussdnotifynwrelease.h" +#include "cphsrvresourcemanager.h" +#include "cphsrvussdreplytimer.h" +#include "mphsrvussdmessagesentobserver.h" +#include "mphsrvphoneinterface.h" +#include "cphsrvussdsessioncancelwaiter.h" #include #include @@ -47,27 +47,15 @@ #include #include #include -// <-- QT PHONE START--> -//#include -// <-- QT PHONE END--> -#include "PhSrvDebugInfo.h" +#include "phsrvdebuginfo.h" #include -// <-- QT PHONE START--> -//#include -// <-- QT PHONE END--> #include -// <-- QT PHONE START--> -//#include -// <-- QT PHONE END--> #include // CONSTANTS const TInt KPhSrvDefaultValue = 0x00000000; // const TInt KPhSrvUssdNoTone = 0; // See SharedDataKeysVariant.h or NcnListInternalPSKeys.h -// <-- QT PHONE START--> -//const TInt KPhSrvUssdTone = 2; // See SharedDataKeysVariant.h or NcnListInternalPSKeys.h -// <-- QT PHONE END--> // const TInt KPhSrvUssdTimeOutObserverGranularity = 2; // const TInt KPhSrvUssdSentMessageObserverGranularity = 2; const TInt KPhSrvUssdAppUID = 0x10005955; @@ -911,15 +899,7 @@ // Play the USSD tone if needed. Logically should be in RunL, but here // to give better balancing with voice and visible message. - // <-- QT PHONE START--> - /* - if ( IsTelephonyFeatureSupported( KTelephonyLVFlagUssdTone ) ) - { - _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.PlayTone" ); - PlayUssdTone(); - } - */ - // <-- QT PHONE END--> + // Launch the new message query if ( !IsActive() ) { @@ -1972,28 +1952,6 @@ { _DPRINT( 4, "PhSrv.UssdM.GetTelephonyVariantData.Start" ); TInt err = KErrNone; -// <-- QT PHONE START--> -/* - // Variation data should be unchangable during run-time, - // therefore, if once succesfully read, later reads are - // not allowed. - if ( iVariantReadOnlyValues == KPhSrvDefaultValue ) - { - CRepository* cenRepSession = NULL; - TRAP ( err , - cenRepSession = CRepository::NewL( KCRUidTelVariation ) ); - if ( err == KErrNone ) - { - err = cenRepSession->Get( KTelVariationFlags, - iVariantReadOnlyValues ); - } - delete cenRepSession; - } - - _DDPRINT( 4, "PhSrv.UssdM.variant", iVariantReadOnlyValues ); // debug print - _DPRINT( 4, "PhSrv.UssdM.GetTelephonyVariantData.End" ); - */ -// <-- QT PHONE END--> return err; } diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdNotifyNWRelease.cpp --- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdNotifyNWRelease.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdNotifyNWRelease.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include "CPhSrvUssdNotifyNWRelease.h" -#include "MPhSrvUssdNetworkObserver.h" -#include "PhSrvDebugInfo.h" +#include "cphsrvussdnotifynwrelease.h" +#include "mphsrvussdnetworkobserver.h" +#include "phsrvdebuginfo.h" // CONSTANTS const TInt KPhSrvUssdReceiverPriority = CActive::EPriorityLow + 2; diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdReceiveHandler.cpp --- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdReceiveHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdReceiveHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhSrvUssdReceiveHandler.h" -#include "MPhSrvUssdNetworkObserver.h" +#include "cphsrvussdreceivehandler.h" +#include "mphsrvussdnetworkobserver.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdReplyTimer.cpp --- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdReplyTimer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdReplyTimer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "CPhSrvUssdReplyTimer.h" -#include "MPhSrvUssdReplyTimerObserver.h" +#include "cphsrvussdreplytimer.h" +#include "mphsrvussdreplytimerobserver.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdSendHandler.cpp --- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdSendHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdSendHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,11 +17,11 @@ // INCLUDE FILES -#include "CPhSrvUssdSendHandler.h" -#include "MPhSrvUssdNetworkObserver.h" -#include "MPhSrvPhoneInterface.h" -#include "CPhSrvUssdSessionCancelWaiter.h" -#include "PhSrvDebugInfo.h" //debug prints +#include "cphsrvussdsendhandler.h" +#include "mphsrvussdnetworkobserver.h" +#include "mphsrvphoneinterface.h" +#include "cphsrvussdsessioncancelwaiter.h" +#include "phsrvdebuginfo.h" //debug prints #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerAnswerCall.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerAnswerCall.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerAnswerCall.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #define CPHONEHANDLERANSWERCALL_H // INCLUDES -#include "PhoneHandlerCallBase.h" +#include "phonehandlercallbase.h" #include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerCallBase.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerCallBase.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerCallBase.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,8 +20,8 @@ #define CPHONEHANDLERCALLBASE // INCLUDES -#include "PhoneHandlerService.h" -#include "PhoneHandlerObserver.h" +#include "phonehandlerservice.h" +#include "phonehandlerobserver.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerControl.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerControl.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerControl.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,9 +20,9 @@ #define CPHONEHANDLERCONTROL_H // INCLUDES -#include "PhoneHandlerService.h" -#include -#include +#include "phonehandlerservice.h" +#include +#include #include #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerDTMF.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerDTMF.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerDTMF.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,8 +21,8 @@ #define CPHONEHANDLERDTMF_H // INCLUDES -#include "PhoneHandlerCallBase.h" -#include +#include "phonehandlercallbase.h" +#include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerDialCall.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerDialCall.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerDialCall.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define CPHONEHANDLERDIALCALL_H // INCLUDES -#include "PhoneHandlerCallBase.h" +#include "phonehandlercallbase.h" #include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerEndCall.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerEndCall.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerEndCall.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #define CPHONEHANDLERENDCALL_H // INCLUDES -#include "PhoneHandlerCallBase.h" +#include "phonehandlercallbase.h" #include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerMultipartyCall.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerMultipartyCall.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerMultipartyCall.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #define CPHONEHANDLERMULTIPARTYCALL_H // INCLUDES -#include "PhoneHandlerCallBase.h" +#include "phonehandlercallbase.h" #include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerRedial.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerRedial.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerRedial.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ #define CPHONEHANDLERLASTNUMBERREDIAL_H // INCLUDES -#include "PhoneHandlerCallBase.h" +#include "phonehandlercallbase.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerResponse.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerResponse.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerResponse.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,8 +20,8 @@ #define CPHONEHANDLERRESPONSE_H // INCLUDES -#include "PhoneHandlerService.h" -#include "PhoneHandlerObserver.h" +#include "phonehandlerservice.h" +#include "phonehandlerobserver.h" #include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerVoiceDial.h --- a/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerVoiceDial.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/inc/PhoneHandlerVoiceDial.h Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #define CPHONEHANDLERVOICEDIAL_H // INCLUDES -#include "PhoneHandlerCallBase.h" +#include "phonehandlercallbase.h" #include // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandler.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" -#include "PhoneHandler.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" +#include "phonehandler.h" // EXTERNAL DATA STRUCTURES diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerActive.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerActive.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerActive.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerActive.h" -#include "PhoneHandlerObserver.h" -#include "PhoneHandlerDebug.h" +#include "phonehandleractive.h" +#include "phonehandlerobserver.h" +#include "phonehandlerdebug.h" // EXTERNAL DATA STRUCTURES diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerAnswerCall.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerAnswerCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerAnswerCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerAnswerCall.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandleranswercall.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallBase.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallBase.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallBase.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include "PhoneHandlerCallBase.h" -#include "PhoneHandlerActive.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlercallbase.h" +#include "phonehandleractive.h" +#include "phonehandlerdebug.h" #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallState.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallState.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallState.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerCallState.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlercallstate.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include // EXTERNAL DATA STRUCTURES diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerControl.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerControl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerControl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,24 +19,21 @@ // INCLUDE FILES -#include "PhoneHandlerControl.h" -#include "PhoneHandlerService.h" -#include "PhoneHandlerAnswerCall.h" -#include "PhoneHandlerEndCall.h" -#include "PhoneHandlerDialCall.h" -#include "PhoneHandlerVoiceDial.h" -#include "PhoneHandlerRedial.h" -#include "PhoneHandlerMultipartyCall.h" -#include "PhoneHandlerDTMF.h" -#include "PhoneHandlerActive.h" -#include "PhoneHandlerResponse.h" -#include "PhoneHandlerCallState.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlercontrol.h" +#include "phonehandlerservice.h" +#include "phonehandleranswercall.h" +#include "phonehandlerendcall.h" +#include "phonehandlerdialcall.h" +#include "phonehandlervoicedial.h" +#include "phonehandlerredial.h" +#include "phonehandlermultipartycall.h" +#include "phonehandlerdtmf.h" +#include "phonehandleractive.h" +#include "phonehandlerresponse.h" +#include "phonehandlercallstate.h" +#include "phonehandlerdebug.h" #include #include -// <-- QT PHONE START --> -//#include -// <-- QT PHONE END--> #include #if 0 @@ -727,37 +724,6 @@ // void CPhoneHandlerControl::InitializeSpeedDialL() { - -// <-- QT PHONE START --> -/* - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::InitializeSpeedDialL() start" ); - - // first check contack engine is not in busy - TInt cntEngState( 0 ); - TInt err = iProperty.Get( KUidSystemCategory, conn::KUidBackupRestoreKey, cntEngState ); - - if( err == KErrNotFound || cntEngState == 0 || - cntEngState & conn::KBURPartTypeMask == conn::EBURNormal || - cntEngState & conn::KBackupIncTypeMask == conn::ENoBackup ) - { - // Get phone number from phonebook by index - CPbkContactEngine* ptr = CPbkContactEngine::NewL(); - CleanupStack::PushL( ptr ); - TRACE_ASSERT( ptr != NULL ); - ptr->GetSpeedDialFieldL( iIndex, iTelNumber ); - COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerControl::InitializeSpeedDialL() speed dial number is %S", &iTelNumber ); - CleanupStack::PopAndDestroy( ptr ); - } - else - { - // contact engine is in busy - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::InitializeSpeedDialL() contact engine is in backup/restore" ); - User::Leave( KErrInUse ); - } -*/ -// <-- QT PHONE END --> - - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::InitializeSpeedDialL() end" ); } // ----------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerDTMF.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerDTMF.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerDTMF.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerDTMF.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlerdtmf.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerDialCall.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerDialCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerDialCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerDialCall.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlerdialcall.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerEndCall.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerEndCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerEndCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerEndCall.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlerendcall.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerMultipartyCall.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerMultipartyCall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerMultipartyCall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerMultipartyCall.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlermultipartycall.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerRedial.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerRedial.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerRedial.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include "PhoneHandlerRedial.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlerredial.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerResponse.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerResponse.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerResponse.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,10 +17,10 @@ // INCLUDE FILES -#include "PhoneHandlerResponse.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerActive.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlerresponse.h" +#include "phonehandlercontrol.h" +#include "phonehandleractive.h" +#include "phonehandlerdebug.h" #include // EXTERNAL DATA STRUCTURES diff -r ae8abd0db65c -r e32024264ebb phonecmdhandler/phonecmdhnlr/src/PhoneHandlerVoiceDial.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerVoiceDial.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerVoiceDial.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerVoiceDial.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "phonehandlervoicedial.h" +#include "phonehandlercontrol.h" +#include "phonehandlerdebug.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonesrv.pro --- a/phonesrv.pro Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv.pro Fri Apr 16 15:31:58 2010 +0300 @@ -23,9 +23,9 @@ SUBDIRS += telutils/xqtelephonyservice SUBDIRS += telutils/dialpad SUBDIRS += vmbx/vmbxcpplugin +SUBDIRS += vmbx/vmbxengine SUBDIRS += cellular/SSSettings/xqbindings/sssettingswrapper SUBDIRS += cellular/telephonysettings/xqbindings/psetwrapper -SUBDIRS += cbs/cbsui +#SUBDIRS += cbs/cbsui SUBDIRS += satui/satapp } - diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/call_information_api/tsrc/src/MT_CallInformation.cpp --- a/phonesrv_plat/call_information_api/tsrc/src/MT_CallInformation.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/call_information_api/tsrc/src/MT_CallInformation.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -30,9 +30,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include //Speaking clock number when calling from NTN network. _LIT (KNumber, "99901"); diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/call_remote_party_information_api/tsrc/src/cdialer.cpp --- a/phonesrv_plat/call_remote_party_information_api/tsrc/src/cdialer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/call_remote_party_information_api/tsrc/src/cdialer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,9 +18,9 @@ #include "cdialer.h" #include -#include -#include -#include +#include +#include +#include //Speaking clock number when calling from NTN network. _LIT (KNumber, "99901"); diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/call_remote_party_information_api/tsrc/src/cdialer.h --- a/phonesrv_plat/call_remote_party_information_api/tsrc/src/cdialer.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/call_remote_party_information_api/tsrc/src/cdialer.h Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ #define CDIALER_H_ #include -#include +#include class CPhCltEmergencyCall; class CPhCltCommandHandler; diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/dial_utils_api/group/bld.inf --- a/phonesrv_plat/dial_utils_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/dial_utils_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/DialUtils.h MW_LAYER_PLATFORM_EXPORT_PATH(DialUtils.h) +../inc/dialutils.h MW_LAYER_PLATFORM_EXPORT_PATH(dialutils.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/dialpad_api/group/bld.inf --- a/phonesrv_plat/dialpad_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/dialpad_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -23,3 +23,4 @@ PRJ_EXPORTS ../inc/dialpad.h MW_LAYER_PLATFORM_EXPORT_PATH(dialpad.h) +../inc/dialpadkeyhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(dialpadkeyhandler.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/dialpad_api/inc/dialpad.h --- a/phonesrv_plat/dialpad_api/inc/dialpad.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/dialpad_api/inc/dialpad.h Fri Apr 16 15:31:58 2010 +0300 @@ -24,9 +24,11 @@ class HbLineEdit; class HbFrameDrawer; +class HbMainWindow; class DialpadInputField; class DialpadKeypad; class DialpadMultitapHandler; +class DialpadBackground; #ifdef BUILD_DIALPAD #define DIALPAD_EXPORT Q_DECL_EXPORT @@ -39,11 +41,14 @@ Q_OBJECT public: - explicit Dialpad(); + explicit Dialpad(); // deprecated + explicit Dialpad(const HbMainWindow& mainWindow); virtual ~Dialpad(); HbLineEdit& editor() const; + bool isOpen() const; + public slots: void openDialpad(); @@ -51,6 +56,8 @@ void setCallButtonEnabled(bool enabled); + void setTapOutsideDismiss(bool dismiss); + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, @@ -74,14 +81,23 @@ void openAnimValueChanged(qreal value); void openAnimFinished(); void orientationChangeStarted(); - void orientationChangeFinished(); + void orientationChangeFinished(Qt::Orientation current); + +private: + void startCloseAnimation(); + void layoutBackgroundItem(); + void updateLayout(Qt::Orientation orientation); + void initialize(); signals: + void aboutToOpen(); void aboutToClose(); private: + const HbMainWindow& mMainWindow; HbFrameDrawer *mBackgroundDrawer; HbFrameDrawer *mIconDrawer; + DialpadBackground* mBackgroundItem; DialpadInputField* mInputField; DialpadKeypad* mKeypad; DialpadMultitapHandler* mMultitap; @@ -92,6 +108,12 @@ bool mAnimationOngoing; QPointF mPosition; int mCloseHandleHeight; + int mCloseHandleWidth; + int mTitleBarHeight; + int mOrientation; + bool mIsOpen; + + friend class DialpadBackground; }; #endif // DIALPAD_H diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/dialpad_api/inc/dialpadkeyhandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonesrv_plat/dialpad_api/inc/dialpadkeyhandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,57 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Dialpad key handler. +* +*/ + +#ifndef DIALPADKEYHANDLER_H +#define DIALPADKEYHANDLER_H + +#include + +class Dialpad; +class DialpadVoiceMailboxEventFilter; +class DialpadBluetoothEventFilter; +class HbMainWindow; + +#ifdef BUILD_DIALPADKEYHANDLER +#define DIALPADKEYHANDLER_EXPORT Q_DECL_EXPORT +#else +#define DIALPADKEYHANDLER_EXPORT Q_DECL_IMPORT +#endif +/*! + DialpadKeyHandler + Class provides key handling for dialpad component. + + @code + Dialpad *dialpad = new Dialpad(); + DialpadKeyHandler *keyhandler = new DialpadKeyHandler(dialpad, this); + @endcode + +*/ +class DIALPADKEYHANDLER_EXPORT DialpadKeyHandler : public QObject +{ + Q_OBJECT + +public: + explicit DialpadKeyHandler(Dialpad *dialPad, HbMainWindow& mainWindow, QObject *parent = 0); + virtual ~DialpadKeyHandler(); + +private: + DialpadVoiceMailboxEventFilter* mVmbxFilter; + DialpadBluetoothEventFilter* mBtFilter; + HbMainWindow& mMainWindow; +}; + +#endif // DIALPADKEYHANDLER_H diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/network_handling_engine_api/group/bld.inf --- a/phonesrv_plat/network_handling_engine_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/network_handling_engine_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,6 +24,6 @@ PRJ_EXPORTS -../inc/NetworkHandlingProxy.h MW_LAYER_PLATFORM_EXPORT_PATH(NetworkHandlingProxy.h) -../inc/CNWSession.h MW_LAYER_PLATFORM_EXPORT_PATH(CNWSession.h) -../inc/NWHandlingEngine.h MW_LAYER_PLATFORM_EXPORT_PATH(NWHandlingEngine.h) +../inc/networkhandlingproxy.h MW_LAYER_PLATFORM_EXPORT_PATH(networkhandlingproxy.h) +../inc/cnwsession.h MW_LAYER_PLATFORM_EXPORT_PATH(cnwsession.h) +../inc/nwhandlingengine.h MW_LAYER_PLATFORM_EXPORT_PATH(nwhandlingengine.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_api/group/bld.inf --- a/phonesrv_plat/phone_client_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,5 +24,5 @@ PRJ_EXPORTS -../inc/PhCltTypes.h MW_LAYER_PLATFORM_EXPORT_PATH(PhCltTypes.h) -../inc/RPhCltServer.h MW_LAYER_PLATFORM_EXPORT_PATH(RPhCltServer.h) +../inc/phclttypes.h MW_LAYER_PLATFORM_EXPORT_PATH(phclttypes.h) +../inc/rphcltserver.h MW_LAYER_PLATFORM_EXPORT_PATH(rphcltserver.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_command_handler_api/group/bld.inf --- a/phonesrv_plat/phone_client_command_handler_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_command_handler_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/CPhCltCommandHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltCommandHandler.h) +../inc/cphcltcommandhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltcommandhandler.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_emergency_call_api/group/bld.inf --- a/phonesrv_plat/phone_client_emergency_call_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_emergency_call_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,5 +24,5 @@ PRJ_EXPORTS -../inc/MPhCltEmergencyCallObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(MPhCltEmergencyCallObserver.h) -../inc/CPhCltEmergencyCall.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltEmergencyCall.h) +../inc/mphcltemergencycallobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mphcltemergencycallobserver.h) +../inc/cphcltemergencycall.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltemergencycall.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_emergency_call_api/tsrc/src/it_emergencycalltests.cpp --- a/phonesrv_plat/phone_client_emergency_call_api/tsrc/src/it_emergencycalltests.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_emergency_call_api/tsrc/src/it_emergencycalltests.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_emergency_call_api/tsrc/src/it_emergencycalltests.h --- a/phonesrv_plat/phone_client_emergency_call_api/tsrc/src/it_emergencycalltests.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_emergency_call_api/tsrc/src/it_emergencycalltests.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include // FORWARD DECLARATIONS class CPhCltEmergencyCall; diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_image_handler_api/group/bld.inf --- a/phonesrv_plat/phone_client_image_handler_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_image_handler_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,6 +24,6 @@ PRJ_EXPORTS -../inc/CPhCltImageHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltImageHandler.h) -../inc/CPhCltBaseImageParams.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltBaseImageParams.h) -../inc/CPhCltImageParams.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltImageParams.h) +../inc/cphcltimagehandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltimagehandler.h) +../inc/cphcltbaseimageparams.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltbaseimageparams.h) +../inc/cphcltimageparams.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltimageparams.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_messenger_api/group/bld.inf --- a/phonesrv_plat/phone_client_messenger_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_messenger_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/CPhCltMessenger.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltMessenger.h) +../inc/cphcltmessenger.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltmessenger.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_notify_api/group/bld.inf --- a/phonesrv_plat/phone_client_notify_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_notify_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ PRJ_EXPORTS -../inc/CPhCltCallNotify.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltCallNotify.h) +../inc/cphcltcallnotify.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltcallnotify.h) ../inc/cphcltdialdata.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltdialdata.h) ../inc/mphcltdialrequestobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mphcltdialrequestobserver.h) ../inc/mphcltdialemergencyrequestobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mphcltdialemergencyrequestobserver.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_server_information_api/group/bld.inf --- a/phonesrv_plat/phone_client_server_information_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_server_information_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,5 +24,5 @@ PRJ_EXPORTS -../inc/PhoneClientServerDomainPStypes.h MW_LAYER_PLATFORM_EXPORT_PATH(PhoneClientServerDomainPStypes.h) -../inc/PhoneClientServerDomainPSkeys.h MW_LAYER_PLATFORM_EXPORT_PATH(PhoneClientServerDomainPSkeys.h) +../inc/phoneclientserverdomainpstypes.h MW_LAYER_PLATFORM_EXPORT_PATH(phoneclientserverdomainpstypes.h) +../inc/phoneclientserverdomainpskeys.h MW_LAYER_PLATFORM_EXPORT_PATH(phoneclientserverdomainpskeys.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_server_information_api/inc/PhoneClientServerDomainPSkeys.h --- a/phonesrv_plat/phone_client_server_information_api/inc/PhoneClientServerDomainPSkeys.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_server_information_api/inc/PhoneClientServerDomainPSkeys.h Fri Apr 16 15:31:58 2010 +0300 @@ -30,7 +30,7 @@ /** * Indication about operator logo change. -* @see TTelOTALogoUpdate in PhoneClientServerDomainPStypes.h +* @see TTelOTALogoUpdate in phoneclientserverdomainpstypes.h * @type RProperty::EByteArray */ diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_ussd_api/group/bld.inf --- a/phonesrv_plat/phone_client_ussd_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_ussd_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/CPhCltUssd.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltUssd.h) +../inc/cphcltussd.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltussd.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_ussd_internal_api/group/bld.inf --- a/phonesrv_plat/phone_client_ussd_internal_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_ussd_internal_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,5 +24,5 @@ PRJ_EXPORTS -../inc/CPhCltUssdSatClient.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltUssdSatClient.h) -../inc/CPhCltUssdInt.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhCltUssdInt.h) +../inc/cphcltussdsatclient.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltussdsatclient.h) +../inc/cphcltussdint.h MW_LAYER_PLATFORM_EXPORT_PATH(cphcltussdint.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_client_utility_api/group/bld.inf --- a/phonesrv_plat/phone_client_utility_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_client_utility_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/PhCltUtils.h MW_LAYER_PLATFORM_EXPORT_PATH(PhCltUtils.h) +../inc/phcltutils.h MW_LAYER_PLATFORM_EXPORT_PATH(phcltutils.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/group/bld.inf --- a/phonesrv_plat/phone_settings_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,23 +24,24 @@ PRJ_EXPORTS -../inc/PSetConstants.h MW_LAYER_PLATFORM_EXPORT_PATH(PSetConstants.h) -../inc/PsetCallWaiting.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetCallWaiting.h) -../inc/MPsetNetworkMode.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetNetworkMode.h) -../inc/MPsetCallWaiting.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetCallWaiting.h) -../inc/MPsetCli.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetCli.h) -../inc/PsetCSP.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetCSP.h) -../inc/PsetNetwork.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetNetwork.h) -../inc/MPsetCallDiverting.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetCallDiverting.h) -../inc/PSetRefreshHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(PSetRefreshHandler.h) +../inc/psetconstants.h MW_LAYER_PLATFORM_EXPORT_PATH(psetconstants.h) +../inc/psetcallwaiting.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcallwaiting.h) +../inc/mpsetnetworkmode.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetnetworkmode.h) +../inc/mpsetcallwaiting.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetcallwaiting.h) +../inc/mpsetcli.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetcli.h) +../inc/psetcsp.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcsp.h) +../inc/psetnetwork.h MW_LAYER_PLATFORM_EXPORT_PATH(psetnetwork.h) +../inc/mpsetcalldiverting.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetcalldiverting.h) +../inc/psetrefreshhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(psetrefreshhandler.h) ../inc/nwdefs.h MW_LAYER_PLATFORM_EXPORT_PATH(nwdefs.h) -../inc/PsetContainer.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetContainer.h) -../inc/PsetCallDiverting.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetCallDiverting.h) -../inc/MPsetNetworkSelect.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetNetworkSelect.h) -../inc/PsetCallBarring.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetCallBarring.h) -../inc/PsetSAObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetSAObserver.h) -../inc/MPsetCallBarring.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetCallBarring.h) -../inc/PsetCli.h MW_LAYER_PLATFORM_EXPORT_PATH(PsetCli.h) +../inc/psetcontainer.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcontainer.h) +../inc/psetcalldiverting.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcalldiverting.h) +../inc/mpsetnetworkselect.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetnetworkselect.h) +../inc/psetcallbarring.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcallbarring.h) +../inc/psetsaobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(psetsaobserver.h) +../inc/mpsetcallbarring.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetcallbarring.h) +../inc/psetcli.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcli.h) +../inc/psetcallbarringwrapper.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcallbarringwrapper.h) ../inc/psetcalldivertingwrapper.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcalldivertingwrapper.h) ../inc/psetcallwaitingwrapper.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcallwaitingwrapper.h) ../inc/psetcliwrapper.h MW_LAYER_PLATFORM_EXPORT_PATH(psetcliwrapper.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/PsetCallBarring.h --- a/phonesrv_plat/phone_settings_api/inc/PsetCallBarring.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/PsetCallBarring.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include "mpsetbarringobs.h" -#include "MPsetCallBarring.h" +#include "mpsetcallbarring.h" #include "msssettingsobserver.h" #include "nwdefs.h" #include diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/PsetCallDiverting.h --- a/phonesrv_plat/phone_settings_api/inc/PsetCallDiverting.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/PsetCallDiverting.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,8 +23,8 @@ // INCLUDES #include #include "nwdefs.h" -#include "PSetConstants.h" -#include "MPsetCallDiverting.h" +#include "psetconstants.h" +#include "mpsetcalldiverting.h" // FORWARD DECLARATIONS class CDesC16ArrayFlat; diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/PsetCallWaiting.h --- a/phonesrv_plat/phone_settings_api/inc/PsetCallWaiting.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/PsetCallWaiting.h Fri Apr 16 15:31:58 2010 +0300 @@ -25,9 +25,9 @@ #include #include "msssettingsobserver.h" #include "nwdefs.h" -#include "MPsetCallWaiting.h" +#include "mpsetcallwaiting.h" #include "mpsetcallwaitingobs.h" -#include "PSetConstants.h" +#include "psetconstants.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/PsetCli.h --- a/phonesrv_plat/phone_settings_api/inc/PsetCli.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/PsetCli.h Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include #include "mpsetcliobserver.h" -#include "MPsetCli.h" +#include "mpsetcli.h" // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/PsetContainer.h --- a/phonesrv_plat/phone_settings_api/inc/PsetContainer.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/PsetContainer.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,12 +23,12 @@ #define PSETCONTAINER_H // INCLUDES -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // FORWARD DECLARATIONS diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/PsetNetwork.h --- a/phonesrv_plat/phone_settings_api/inc/PsetNetwork.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/PsetNetwork.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,10 +21,10 @@ #define PSETNETWORK_H // INCLUDES -#include "MPsetNetworkSelect.h" +#include "mpsetnetworkselect.h" #include "mpsetnetworkinfoobs.h" #include "mpsetnetworkmodeobs.h" -#include "MPsetNetworkMode.h" +#include "mpsetnetworkmode.h" #include #include diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/nwdefs.h --- a/phonesrv_plat/phone_settings_api/inc/nwdefs.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/nwdefs.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include "PSetConstants.h" +#include "psetconstants.h" // DATA TYPES //basic service groups diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/psetcallbarringwrapper.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonesrv_plat/phone_settings_api/inc/psetcallbarringwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,171 @@ +/* + * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ + +#ifndef PSETCALLBARRINGGWRAPPER_H +#define PSETCALLBARRINGGWRAPPER_H + +#include +#include + +// Forward declarations +class CPsetContainer; +class PSetCallBarringWrapperPrivate; + +#ifdef BUILD_PSETWRAPPER +#define PSETWRAPPER_EXPORT Q_DECL_EXPORT +#else +#define PSETWRAPPER_EXPORT Q_DECL_IMPORT +#endif + +class PSETWRAPPER_EXPORT PSetCallBarringWrapper : public QObject +{ + Q_OBJECT + +public: + + /** barring types */ + enum BarringType + { + BarringTypeAllBarrings = 0x0001, + BarringTypeAllOutgoing = 0x0002, + BarringTypeOutgoingInternational = 0x0004, + BarringTypeOutgoingInternationalExceptToHomeCountry = 0x0008, + BarringTypeAllIncoming = 0x0010, + BarringTypeIncomingWhenRoaming = 0x0020, + BarringTypeAllServices, + BarringTypeAllOutgoingServices, + BarringTypeAllIncomingServices + }; + + /** barring status */ + enum BarringStatus + { + BarringStatusUnknown, + BarringStatusActive, + BarringStatusInactive, + BarringStatusNotProvisioned, + BarringStatusUnavailable + }; + + /** barring error */ + enum BarringError + { + BarringErrorNone + }; + +public: + + explicit PSetCallBarringWrapper( + CPsetContainer &psetContainer, + QObject *parent = NULL); + + ~PSetCallBarringWrapper(); + + /** + * Checks the barring status from network. Result is signaled with + * barringStatusRequestCompleted. + * + * @param serviceGroup Service group concerned. + * @param barringType Barring type. + */ + void barringStatus( + PsServiceGroup serviceGroup, + BarringType barringType); + + /** + * Enables specified barring. Result is signaled with + * enableBarringRequestCompleted. + * + * @param serviceGroup Service group concerned. + * @param barringType Barring type. + * @param barringPassword Barring password. + */ + void enableBarring( + PsServiceGroup serviceGroup, + BarringType barringType, + QString barringPassword); + + /** + * Disables specified barring. Result is signaled with + * disableBarringRequestCompleted. + * + * @param serviceGroup Service group concerned. + * @param barringType Barring type. + * @param barringPassword Barring password. + */ + void disableBarring( + PsServiceGroup serviceGroup, + BarringType barringType, + QString barringPassword); + +signals: + + /** + * This signal is emitted when barring status query request is completed. + * + * Basic service group identifier list contains items only if status is + * queried for several services at once and barrings are active for some + * of those services. + * + * @param result 0 if request was completed successfully + * or error code defined either in gsmerror.h or exterror.h. + * @param basicServiceGroupIds Service group identifiers. + * @param status Barring status. + */ + void barringStatusRequestCompleted( + int result, + const QList & basicServiceGroupIds, + PSetCallBarringWrapper::BarringStatus status); + + /** + * This signal is emitted when barring enabling is completed. + * + * @param result 0 if request was completed successfully + * or error code defined either in gsmerror.h or exterror.h. + * @param barringType Service group identifiers. + * @param barringStatus Barring status. + * @param plural Plurality. + */ + void enableBarringRequestCompleted( + int result, + PSetCallBarringWrapper::BarringType barringType, + PSetCallBarringWrapper::BarringStatus barringStatus, + bool plural); + + /** + * This signal is emitted when barring disabling is completed. + * + * @param result 0 if request was completed successfully + * or error code defined either in gsmerror.h or exterror.h. + * @param barringType Service group identifiers. + * @param barringStatus Barring status. + * @param plural Plurality. + */ + void disableBarringRequestCompleted( + int result, + PSetCallBarringWrapper::BarringType barringType, + PSetCallBarringWrapper::BarringStatus barringStatus, + bool plural); + +private: // data + + /** Own. Private implementation. */ + QScopedPointer m_privateImpl; + friend class PSetCallBarringWrapperPrivate; +}; + +#endif // PSETCALLBARRINGGWRAPPER_H diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_api/inc/psetwrapper.h --- a/phonesrv_plat/phone_settings_api/inc/psetwrapper.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/psetwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -24,6 +24,7 @@ class PSetCallWaitingWrapper; class PSetCallDivertingWrapper; class PSetNetworkWrapper; +class PSetCallBarringWrapper; #ifdef BUILD_PSETWRAPPER #define PSETWRAPPER_EXPORT Q_DECL_EXPORT @@ -65,7 +66,13 @@ @exception bad alloc, if creations fails. */ PSetNetworkWrapper& networkWrapper(); - + + /** + Returns reference to call barring settings. + @exception bad alloc, if creations fails. + */ + PSetCallBarringWrapper& callBarringWrapper(); + private: // Data: // Own CPsetContainer *m_psetContainer; @@ -79,6 +86,8 @@ PSetNetworkWrapper *m_networkWrapper; + PSetCallBarringWrapper *m_callBarringWrapper; + }; #endif // PSETWRAPPER diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_notes_ui_api/group/bld.inf --- a/phonesrv_plat/phone_settings_notes_ui_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_notes_ui_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,9 +24,9 @@ PRJ_EXPORTS -../inc/PsuiContainer.h MW_LAYER_PLATFORM_EXPORT_PATH(PsuiContainer.h) -../inc/PsuiBarringObs.h MW_LAYER_PLATFORM_EXPORT_PATH(PsuiBarringObs.h) -../inc/PsuiCliObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(PsuiCliObserver.h) -../inc/PsuiConstants.h MW_LAYER_PLATFORM_EXPORT_PATH(PsuiConstants.h) -../inc/PsuiWaitingObs.h MW_LAYER_PLATFORM_EXPORT_PATH(PsuiWaitingObs.h) -../inc/PsuiDivertObs.h MW_LAYER_PLATFORM_EXPORT_PATH(PsuiDivertObs.h) +../inc/psuicontainer.h MW_LAYER_PLATFORM_EXPORT_PATH(psuicontainer.h) +../inc/psuibarringobs.h MW_LAYER_PLATFORM_EXPORT_PATH(psuibarringobs.h) +../inc/psuicliobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(psuicliobserver.h) +../inc/psuiconstants.h MW_LAYER_PLATFORM_EXPORT_PATH(psuiconstants.h) +../inc/psuiwaitingobs.h MW_LAYER_PLATFORM_EXPORT_PATH(psuiwaitingobs.h) +../inc/psuidivertobs.h MW_LAYER_PLATFORM_EXPORT_PATH(psuidivertobs.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/phone_settings_observer_api/group/bld.inf --- a/phonesrv_plat/phone_settings_observer_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/phone_settings_observer_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,10 +24,10 @@ PRJ_EXPORTS -../inc/MPsetCallWaitingObs.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetCallWaitingObs.h) -../inc/MPsetDivertObs.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetDivertObs.h) -../inc/MPsetCliObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetCliObserver.h) -../inc/MPsetNetworkInfoObs.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetNetworkInfoObs.h) -../inc/MPsetBarringObs.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetBarringObs.h) -../inc/MPsetRequestObs.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetRequestObs.h) -../inc/MPsetNetworkModeObs.h MW_LAYER_PLATFORM_EXPORT_PATH(MPsetNetworkModeObs.h) +../inc/mpsetcallwaitingobs.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetcallwaitingobs.h) +../inc/mpsetdivertobs.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetdivertobs.h) +../inc/mpsetcliobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetcliobserver.h) +../inc/mpsetnetworkinfoobs.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetnetworkinfoobs.h) +../inc/mpsetbarringobs.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetbarringobs.h) +../inc/mpsetrequestobs.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetrequestobs.h) +../inc/mpsetnetworkmodeobs.h MW_LAYER_PLATFORM_EXPORT_PATH(mpsetnetworkmodeobs.h) diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/ss_settings_api/group/bld.inf --- a/phonesrv_plat/ss_settings_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/ss_settings_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,9 +24,9 @@ PRJ_EXPORTS -../inc/MSSSettingsRefreshObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(MSSSettingsRefreshObserver.h) -../inc/MSSSettingsObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(MSSSettingsObserver.h) -../inc/RCustomerServiceProfileCache.h MW_LAYER_PLATFORM_EXPORT_PATH(RCustomerServiceProfileCache.h) -../inc/RSSSettings.h MW_LAYER_PLATFORM_EXPORT_PATH(RSSSettings.h) +../inc/msssettingsrefreshobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(msssettingsrefreshobserver.h) +../inc/msssettingsobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(msssettingsobserver.h) +../inc/rcustomerserviceprofilecache.h MW_LAYER_PLATFORM_EXPORT_PATH(rcustomerserviceprofilecache.h) +../inc/rsssettings.h MW_LAYER_PLATFORM_EXPORT_PATH(rsssettings.h) ../inc/sssettingswrappertypes.h MW_LAYER_PLATFORM_EXPORT_PATH(sssettingswrappertypes.h) ../inc/sssettingswrapper.h MW_LAYER_PLATFORM_EXPORT_PATH(sssettingswrapper.h) \ No newline at end of file diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/ss_settings_api/inc/RSSSettings.h --- a/phonesrv_plat/ss_settings_api/inc/RSSSettings.h Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/ss_settings_api/inc/RSSSettings.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include -#include +#include // DATA TYPES diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/string_parser_api/group/bld.inf --- a/phonesrv_plat/string_parser_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/string_parser_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,19 +24,19 @@ PRJ_EXPORTS -../inc/PhoneGsmParser.h MW_LAYER_PLATFORM_EXPORT_PATH(PhoneGsmParser.h) -../inc/CPhoneGsmPhoneNumberHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmPhoneNumberHandler.h) -../inc/CPhoneGsmParserResult.inl MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmParserResult.inl) -../inc/CPhoneGsmHandlerContainer.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmHandlerContainer.h) -../inc/CPhoneGsmParserResult.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmParserResult.h) -../inc/CPhoneGsmHandlerBase.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmHandlerBase.h) -../inc/CPhoneGsmSsCallHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmSsCallHandler.h) -../inc/CPhoneGsmMiscHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmMiscHandler.h) -../inc/CPhoneGsmParserBase.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmParserBase.h) -../inc/CPhoneGsmManufacturerHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmManufacturerHandler.h) -../inc/CPhoneGsmSimControlHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmSimControlHandler.h) -../inc/CPhoneGsmPcnProcedureHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmPcnProcedureHandler.h) -../inc/CPhoneGsmSsHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmSsHandler.h) -../inc/CPhoneGsmOptionContainerBase.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmOptionContainerBase.h) -../inc/CPhoneGsmEmergencyNumberHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneGsmEmergencyNumberHandler.h) -../inc/CPhoneVoipNumberHandler.h MW_LAYER_PLATFORM_EXPORT_PATH(CPhoneVoipNumberHandler.h) \ No newline at end of file +../inc/phonegsmparser.h MW_LAYER_PLATFORM_EXPORT_PATH(phonegsmparser.h) +../inc/cphonegsmphonenumberhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmphonenumberhandler.h) +../inc/cphonegsmparserresult.inl MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmparserresult.inl) +../inc/cphonegsmhandlercontainer.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmhandlercontainer.h) +../inc/cphonegsmparserresult.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmparserresult.h) +../inc/cphonegsmhandlerbase.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmhandlerbase.h) +../inc/cphonegsmsscallhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmsscallhandler.h) +../inc/cphonegsmmischandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmmischandler.h) +../inc/cphonegsmparserbase.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmparserbase.h) +../inc/cphonegsmmanufacturerhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmmanufacturerhandler.h) +../inc/cphonegsmsimcontrolhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmsimcontrolhandler.h) +../inc/cphonegsmpcnprocedurehandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmpcnprocedurehandler.h) +../inc/cphonegsmsshandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmsshandler.h) +../inc/cphonegsmoptioncontainerbase.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmoptioncontainerbase.h) +../inc/cphonegsmemergencynumberhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonegsmemergencynumberhandler.h) +../inc/cphonevoipnumberhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(cphonevoipnumberhandler.h) \ No newline at end of file diff -r ae8abd0db65c -r e32024264ebb phonesrv_plat/telephony_network_information_api/group/bld.inf --- a/phonesrv_plat/telephony_network_information_api/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/phonesrv_plat/telephony_network_information_api/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/NetworkHandlingDomainPSKeys.h MW_LAYER_PLATFORM_EXPORT_PATH(NetworkHandlingDomainPSKeys.h) +../inc/networkhandlingdomainpskeys.h MW_LAYER_PLATFORM_EXPORT_PATH(networkhandlingdomainpskeys.h) diff -r ae8abd0db65c -r e32024264ebb satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp --- a/satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "SATPrivateCRKeys.h" #include "csatmediatoreventprovider.h" diff -r ae8abd0db65c -r e32024264ebb satengine/SatServer/SystemState/src/CSatSystemState.cpp --- a/satengine/SatServer/SystemState/src/CSatSystemState.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/satengine/SatServer/SystemState/src/CSatSystemState.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -26,7 +26,11 @@ #include #include #include -#include +// ****************************************************************** +// TODO: ScreensaverInternalPSKeys.h does no longer exist. +// Must find an alternative way to check screen locked state. +// #include +// ****************************************************************** #include #include #include @@ -295,6 +299,11 @@ LOG( SIMPLE, "SATSYSTEMSTATE: CSatSystemState::IsScreenSaverActivedFromIdle calling" ) TBool result( EFalse ); + + /* + // TODO: This method can no longer be used for checking screen saver status. + // Must find an alternative method. + TInt screenSaverActive( -1 ); // Get the idle status from P&S @@ -313,7 +322,8 @@ LOG2( SIMPLE, "SATSYSTEMSTATE: CSatSystemState:: IsScreenSaverActivedFromIdle \ err: %d", err ) - + */ + LOG2( SIMPLE, "SATSYSTEMSTATE: CSatSystemState:: \ IsScreenSaverActivedFromIdle exiting with value: %d", result ) diff -r ae8abd0db65c -r e32024264ebb satengine/SatServer/inc/CSatCommandHandler.h --- a/satengine/SatServer/inc/CSatCommandHandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/satengine/SatServer/inc/CSatCommandHandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include #include -#include +#include #include "MSatUtils.h" #include "MSatEventObserver.h" #include "MSatCommand.h" diff -r ae8abd0db65c -r e32024264ebb satui/satapp/inc/satappuiprovider.h --- a/satui/satapp/inc/satappuiprovider.h Fri Mar 19 09:40:14 2010 +0200 +++ b/satui/satapp/inc/satappuiprovider.h Fri Apr 16 15:31:58 2010 +0300 @@ -31,7 +31,7 @@ class SatAppGetInkeyNote; // GetInKey class HbInputDialog; // GetInKey class HbDialog; // GetInput -class HbProgressNote; // For wait note +class HbProgressDialog; // For wait note class QTimer; // For SMS/DTMF // Here we create custom document loader to be able to use own classes in XML. @@ -324,11 +324,11 @@ /* * Own. SmsWaitNote */ - HbProgressNote *mSmsWaitNote; + HbProgressDialog *mSmsWaitNote; /* * Own. DtmfWaitNote */ - HbProgressNote *mDtmfWaitNote; + HbProgressDialog *mDtmfWaitNote; /* * Own. SetUpCall Query diff -r ae8abd0db65c -r e32024264ebb satui/satapp/inc/satappview.h --- a/satui/satapp/inc/satappview.h Fri Mar 19 09:40:14 2010 +0200 +++ b/satui/satapp/inc/satappview.h Fri Apr 16 15:31:58 2010 +0300 @@ -137,10 +137,6 @@ void keyPressEvent(QKeyEvent *event); private: // New method - /** - * Set the secondary softkey as back softkey. - */ - void setSoftkeyBack(); /** * Connect item with menuItemSelected. diff -r ae8abd0db65c -r e32024264ebb satui/satapp/src/satappuiprovider.cpp --- a/satui/satapp/src/satappuiprovider.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/satui/satapp/src/satappuiprovider.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -24,7 +24,7 @@ #include // DisplayText, ConfirmSend, SetUpCall #include // DisplayText, GetInput, SetUpCall #include // GetInkey -#include // SendSms wait note +#include // SendSms wait note #include // For GetInput #include // GetInput #include "satappview.h" // SetUpMenu, SelectItem @@ -304,7 +304,7 @@ mGetInkeyQuery->setPromptText(aHeading); // Set ContentText QVariant vContent(aContent); - mGetInkeyQuery->setTextValue(vContent); + mGetInkeyQuery->setValue(vContent); // Validation rule, what can be entered HbValidator *val =new HbValidator; @@ -333,7 +333,7 @@ mGetInkeyQuery->exec(); TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInkeyQuery end pop") - QString inputString = (mGetInkeyQuery->textValue()).toString(); + QString inputString = (mGetInkeyQuery->value()).toString(); TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetInkeyQuery \ inputString=%s", inputString.utf16()) aContent = inputString; @@ -432,7 +432,7 @@ mGetInputQuery->setPromptText(heading); // Set ContentText QVariant vContent(content); - mGetInputQuery->setTextValue(vContent); + mGetInputQuery->setValue(vContent); // Validation rule, what can be entered HbValidator *val =new HbValidator; @@ -476,7 +476,7 @@ mGetInputQuery->exec(); TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInputQuery end pop") - content = (mGetInputQuery->textValue()).toString(); + content = (mGetInputQuery->value()).toString(); TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetInputQuery out content=%s", content.utf16()) @@ -578,7 +578,7 @@ { TFLOGSTRING("SATAPP: SatAppUiProvider::showSmsWaitNote") - mSmsWaitNote = new HbProgressNote(HbProgressNote::WaitNote); + mSmsWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog); //remove the default cancel softkey mSmsWaitNote->removeAction(mSmsWaitNote->primaryAction()); if(aText.isEmpty()) { @@ -608,7 +608,7 @@ mDtmfWaitNote = 0; } - mDtmfWaitNote = new HbProgressNote(HbProgressNote::WaitNote); + mDtmfWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog); //remove the default cancel softkey bool ret = connect(mDtmfWaitNote->primaryAction(), SIGNAL(triggered()), this, SLOT(cancelDtmfResponse())); diff -r ae8abd0db65c -r e32024264ebb satui/satapp/src/satappview.cpp --- a/satui/satapp/src/satappview.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/satui/satapp/src/satappview.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -198,14 +198,6 @@ } // connect setup menu item connectItem(); - - if (mWindow) { - //Set the secondary softkey as quit when receiving the - //SetUpMenu command - TFLOGSTRING("SATAPP: SatAppView::SetUpMenu, \ - initialize secondary softkey as quit key") - mWindow->addSoftKeyAction(Hb::SecondarySoftKey, mSoftKeyQuitAction); - } } TFLOGSTRING("SATAPP: SatAppView::SetUpMenu exit") } @@ -254,8 +246,6 @@ mSelectListWidget->addItem(aMenuItems.at( i )); } } - // Set Back key - setSoftkeyBack(); // connect selectitem connectItem(); @@ -339,20 +329,6 @@ } // ---------------------------------------------------------------------------- -// SatAppView::setSoftkeyBack -// (Set back action). -// ---------------------------------------------------------------------------- -// -void SatAppView::setSoftkeyBack() -{ - TFLOGSTRING("SATAPP: SatAppView::setSoftkeyBack") - if (mWindow && mSoftKeyBackAction) { - mWindow->addSoftKeyAction(Hb::SecondarySoftKey, mSoftKeyBackAction); - } - TFLOGSTRING("SATAPP: SatAppView::setSoftkeyBack Exit") -} - -// ---------------------------------------------------------------------------- // SatAppView::backButtonClicked // (Back action). // ---------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/bwins/dialpadu.def --- a/telutils/dialpad/bwins/dialpadu.def Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/bwins/dialpadu.def Fri Apr 16 15:31:58 2010 +0300 @@ -1,32 +1,52 @@ EXPORTS - ?trUtf8@Dialpad@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString Dialpad::trUtf8(char const *, char const *, int) - ?closeAnimValueChanged@Dialpad@@IAEXM@Z @ 2 NONAME ; void Dialpad::closeAnimValueChanged(float) - ?qt_metacast@Dialpad@@UAEPAXPBD@Z @ 3 NONAME ; void * Dialpad::qt_metacast(char const *) - ?orientationChangeFinished@Dialpad@@IAEXXZ @ 4 NONAME ; void Dialpad::orientationChangeFinished(void) - ?closeEvent@Dialpad@@MAEXPAVQCloseEvent@@@Z @ 5 NONAME ; void Dialpad::closeEvent(class QCloseEvent *) - ?openDialpad@Dialpad@@QAEXXZ @ 6 NONAME ; void Dialpad::openDialpad(void) - ??0Dialpad@@QAE@XZ @ 7 NONAME ; Dialpad::Dialpad(void) - ?sceneEvent@Dialpad@@MAE_NPAVQEvent@@@Z @ 8 NONAME ; bool Dialpad::sceneEvent(class QEvent *) - ?openAnimValueChanged@Dialpad@@IAEXM@Z @ 9 NONAME ; void Dialpad::openAnimValueChanged(float) - ?handleSceneEvent@Dialpad@@IAE_NPAVQEvent@@@Z @ 10 NONAME ; bool Dialpad::handleSceneEvent(class QEvent *) - ?showEvent@Dialpad@@MAEXPAVQShowEvent@@@Z @ 11 NONAME ; void Dialpad::showEvent(class QShowEvent *) - ?metaObject@Dialpad@@UBEPBUQMetaObject@@XZ @ 12 NONAME ; struct QMetaObject const * Dialpad::metaObject(void) const - ?hideEvent@Dialpad@@MAEXPAVQHideEvent@@@Z @ 13 NONAME ; void Dialpad::hideEvent(class QHideEvent *) - ?staticMetaObject@Dialpad@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const Dialpad::staticMetaObject - ?tr@Dialpad@@SA?AVQString@@PBD0@Z @ 15 NONAME ; class QString Dialpad::tr(char const *, char const *) - ??1Dialpad@@UAE@XZ @ 16 NONAME ; Dialpad::~Dialpad(void) - ?getStaticMetaObject@Dialpad@@SAABUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const & Dialpad::getStaticMetaObject(void) - ?orientationChangeStarted@Dialpad@@IAEXXZ @ 18 NONAME ; void Dialpad::orientationChangeStarted(void) - ?trUtf8@Dialpad@@SA?AVQString@@PBD0@Z @ 19 NONAME ; class QString Dialpad::trUtf8(char const *, char const *) - ?qt_metacall@Dialpad@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 20 NONAME ; int Dialpad::qt_metacall(enum QMetaObject::Call, int, void * *) - ?paint@Dialpad@@MAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 21 NONAME ; void Dialpad::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) - ?tr@Dialpad@@SA?AVQString@@PBD0H@Z @ 22 NONAME ; class QString Dialpad::tr(char const *, char const *, int) - ?sceneEventFilter@Dialpad@@MAE_NPAVQGraphicsItem@@PAVQEvent@@@Z @ 23 NONAME ; bool Dialpad::sceneEventFilter(class QGraphicsItem *, class QEvent *) - ?openAnimFinished@Dialpad@@IAEXXZ @ 24 NONAME ; void Dialpad::openAnimFinished(void) - ?setCallButtonEnabled@Dialpad@@QAEX_N@Z @ 25 NONAME ; void Dialpad::setCallButtonEnabled(bool) - ?closeDialpad@Dialpad@@QAEXXZ @ 26 NONAME ; void Dialpad::closeDialpad(void) - ??_EDialpad@@UAE@I@Z @ 27 NONAME ; Dialpad::~Dialpad(unsigned int) - ?editor@Dialpad@@QBEAAVHbLineEdit@@XZ @ 28 NONAME ; class HbLineEdit & Dialpad::editor(void) const - ?closeAnimFinished@Dialpad@@IAEXXZ @ 29 NONAME ; void Dialpad::closeAnimFinished(void) - ?aboutToClose@Dialpad@@IAEXXZ @ 30 NONAME ; void Dialpad::aboutToClose(void) + ?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) diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/dialpad.pro --- a/telutils/dialpad/dialpad.pro Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/dialpad.pro Fri Apr 16 15:31:58 2010 +0300 @@ -19,23 +19,33 @@ TARGET = dialpad CONFIG += hb -INCLUDEPATH += . inc +INCLUDEPATH += . inc ../../inc HEADERS += ../../phonesrv_plat/dialpad_api/inc/dialpad.h \ + ../../phonesrv_plat/dialpad_api/inc/dialpadkeyhandler.h \ inc/dialpadbutton.h \ inc/dialpadbuttonstyle.h \ inc/dialpadinputfield.h \ inc/dialpadkeypad.h \ - inc/dialpadmultitaphandler.h + inc/dialpadmultitaphandler.h\ + inc/dialpadsymbianwrapper.h \ + inc/dialpadbackground.h \ + inc/dialpadvoicemailboxeventfilter.h \ + inc/dialpadbluetootheventfilter.h SOURCES += src/dialpad.cpp \ src/dialpadbutton.cpp \ src/dialpadbuttonstyle.cpp \ src/dialpadinputfield.cpp \ src/dialpadkeypad.cpp \ - src/dialpadmultitaphandler.cpp + src/dialpadmultitaphandler.cpp\ + src/dialpadkeyhandler.cpp \ + src/dialpadsymbianwrapper.cpp \ + src/dialpadbackground.cpp \ + src/dialpadvoicemailboxeventfilter.cpp \ + src/dialpadbluetootheventfilter.cpp -RESOURCES += resources/dialpad.qrc +RESOURCES += dialpad.qrc symbian { TARGET.EPOCALLOWDLLDATA = 1 @@ -51,11 +61,21 @@ MMP_RULES += defFiles + HEADERS += inc/dialpadsymbianwrapper_p.h + SOURCES += src/dialpadsymbianwrapper_p.cpp + BLD_INF_RULES.prj_exports += \ "$${LITERAL_HASH}include " \ - "./rom/dialpad.iby CORE_MW_LAYER_IBY_EXPORT_PATH(dialpad.iby)" + "./rom/dialpad.iby CORE_MW_LAYER_IBY_EXPORT_PATH(dialpad.iby)" + + LIBS += -lxqservice \ + -lxqserviceutil \ + -lvmbxengine } else:win32 { + HEADERS += inc/dialpadsymbianwrapper_p_stub.h + SOURCES += src/dialpadsymbianwrapper_p_stub.cpp + # Put it to Hb/lib because it is in path DESTDIR = c:/hb/lib DLLDESTDIR = c:/hb/bin @@ -63,6 +83,8 @@ c:/hb/include/hbcore \ c:/hb/include/hbwidgets \ c:/hb/include/hbtools + INCLUDEPATH += ../xqtelephonyservice/inc } -DEFINES += BUILD_DIALPAD +DEFINES += BUILD_DIALPAD \ + BUILD_DIALPADKEYHANDLER diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/dialpad.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/dialpad.qrc Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,35 @@ + + + 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 + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/eabi/dialpadu.def --- a/telutils/dialpad/eabi/dialpadu.def Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/eabi/dialpadu.def Fri Apr 16 15:31:58 2010 +0300 @@ -1,39 +1,60 @@ EXPORTS - _ZN7Dialpad10closeEventEP11QCloseEvent @ 1 NONAME - _ZN7Dialpad10sceneEventEP6QEvent @ 2 NONAME - _ZN7Dialpad11openDialpadEv @ 3 NONAME - _ZN7Dialpad11qt_metacallEN11QMetaObject4CallEiPPv @ 4 NONAME - _ZN7Dialpad11qt_metacastEPKc @ 5 NONAME - _ZN7Dialpad12aboutToCloseEv @ 6 NONAME - _ZN7Dialpad12closeDialpadEv @ 7 NONAME - _ZN7Dialpad16handleSceneEventEP6QEvent @ 8 NONAME - _ZN7Dialpad16openAnimFinishedEv @ 9 NONAME - _ZN7Dialpad16sceneEventFilterEP13QGraphicsItemP6QEvent @ 10 NONAME - _ZN7Dialpad16staticMetaObjectE @ 11 NONAME DATA 16 - _ZN7Dialpad17closeAnimFinishedEv @ 12 NONAME - _ZN7Dialpad19getStaticMetaObjectEv @ 13 NONAME - _ZN7Dialpad20openAnimValueChangedEf @ 14 NONAME - _ZN7Dialpad20setCallButtonEnabledEb @ 15 NONAME - _ZN7Dialpad21closeAnimValueChangedEf @ 16 NONAME - _ZN7Dialpad24orientationChangeStartedEv @ 17 NONAME - _ZN7Dialpad25orientationChangeFinishedEv @ 18 NONAME - _ZN7Dialpad5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 19 NONAME - _ZN7Dialpad9hideEventEP10QHideEvent @ 20 NONAME - _ZN7Dialpad9showEventEP10QShowEvent @ 21 NONAME - _ZN7DialpadC1Ev @ 22 NONAME - _ZN7DialpadC2Ev @ 23 NONAME - _ZN7DialpadD0Ev @ 24 NONAME - _ZN7DialpadD1Ev @ 25 NONAME - _ZN7DialpadD2Ev @ 26 NONAME - _ZNK7Dialpad10metaObjectEv @ 27 NONAME - _ZNK7Dialpad6editorEv @ 28 NONAME - _ZTI7Dialpad @ 29 NONAME - _ZTV7Dialpad @ 30 NONAME - _ZThn16_N7DialpadD0Ev @ 31 NONAME - _ZThn16_N7DialpadD1Ev @ 32 NONAME - _ZThn8_N7Dialpad10sceneEventEP6QEvent @ 33 NONAME - _ZThn8_N7Dialpad16sceneEventFilterEP13QGraphicsItemP6QEvent @ 34 NONAME - _ZThn8_N7Dialpad5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 35 NONAME - _ZThn8_N7DialpadD0Ev @ 36 NONAME - _ZThn8_N7DialpadD1Ev @ 37 NONAME + _ZN17DialpadKeyHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME + _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 diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadbackground.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/inc/dialpadbackground.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,49 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Background item to close dialpad when tapping outside. +* +*/ + +#ifndef DIALPADBACKGROUND_H +#define DIALPADBACKGROUND_H + +#include "qgraphicsitem.h" + +class Dialpad; + +class DialpadBackground : public QGraphicsItem +{ +public: + DialpadBackground(Dialpad& dialpad); + virtual ~DialpadBackground(); + + void setRect(QRectF rect); + QRectF boundingRect() const; + +protected: + void paint( + QPainter *painter, + const QStyleOptionGraphicsItem *option, + QWidget *widget = 0); + void mousePressEvent(QGraphicsSceneMouseEvent * event); + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent * event); + +private: + Dialpad& mDialpad; + QRectF mRect; + bool mPressed; +}; + +#endif // DIALPADBACKGROUND_H diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadbluetootheventfilter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/inc/dialpadbluetootheventfilter.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,55 @@ +/*! +* 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 DIALPADBLUETOOTHEVENTFILTER_H +#define DIALPADBLUETOOTHEVENTFILTER_H + +#include + +class QTimer; +class Dialpad; + +/*! + DialpadBluetoothEventFilter + Class provides bluetooth on/off key handling. +*/ +class DialpadBluetoothEventFilter : public QObject +{ + Q_OBJECT + +public: + explicit DialpadBluetoothEventFilter(Dialpad* dialpad, QObject* parent = 0); + virtual ~DialpadBluetoothEventFilter(); + +protected: + bool eventFilter(QObject *watched, QEvent *event); + +private slots: + /*! + \fn void toggleBluetooth() + + Toggles bluetooth on or off. + */ + void toggleBluetooth(); + + +private: + QTimer *mLongPressTimer; + Dialpad* mDialpad; +}; + +#endif // DIALPADBLUETOOTHEVENTFILTER_H diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadkeypad.h --- a/telutils/dialpad/inc/dialpadkeypad.h Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/inc/dialpadkeypad.h Fri Apr 16 15:31:58 2010 +0300 @@ -35,6 +35,7 @@ public: explicit DialpadKeypad( + const HbMainWindow& mainWindow, DialpadInputField& inputField, QGraphicsItem* parent=0); @@ -63,6 +64,7 @@ inline bool isNumericKey(int key); private: + const HbMainWindow& mMainWindow; DialpadInputField& mInputField; QGraphicsGridLayout* mGridLayout; DialpadButton* mButtons[DialpadButtonCount]; diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadmultitaphandler.h --- a/telutils/dialpad/inc/dialpadmultitaphandler.h Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/inc/dialpadmultitaphandler.h Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ #ifndef DIALPADMULTITAPHANDLER_H_ #define DIALPADMULTITAPHANDLER_H_ -#include +#include #include #include diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadsymbianwrapper.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/inc/dialpadsymbianwrapper.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,49 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef DIALPADSYMBIANWRAPPER_H +#define DIALPADSYMBIANWRAPPER_H + +#include +#include +#include + +class DialpadSymbianWrapperPrivate; + +/*! + DialpadSymbianWrapper +*/ +class DialpadSymbianWrapper : public QObject +{ + +Q_OBJECT + +public: + explicit DialpadSymbianWrapper(QObject *parent = 0); + ~DialpadSymbianWrapper(); + + int getMailboxNumber(QString &vmbxNumber); + + int defineMailboxNumber(QString &vmbxNumber); + +protected: + DialpadSymbianWrapperPrivate *const d_ptr; + + Q_DECLARE_PRIVATE(DialpadSymbianWrapper) +}; + +#endif // DIALPADSYMBIANWRAPPER_H diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadsymbianwrapper_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/inc/dialpadsymbianwrapper_p.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,54 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef DIALPADSYMBIANWRAPPERPRIVATE_H +#define DIALPADSYMBIANWRAPPERPRIVATE_H + +#include +#include + +class CVoiceMailbox; +class CVoiceMailboxEntry; +class DialpadSymbianWrapper; + +/*! + DialpadSymbianWrapperPrivate + +*/ +class DialpadSymbianWrapperPrivate +{ + +public: + + DialpadSymbianWrapperPrivate(DialpadSymbianWrapper *parent); + ~DialpadSymbianWrapperPrivate(); + + int getMailboxNumber(QString &vmbxNumber); + + int defineMailboxNumber(QString &vmbxNumber); + +private: + + QString getVmbxNumber(CVoiceMailboxEntry &vmbxEntry); + + CVoiceMailbox *mVmbx; + + DialpadSymbianWrapper *const q_ptr; + Q_DECLARE_PUBLIC(DialpadSymbianWrapper) +}; + +#endif // DIALPADSYMBIANWRAPPERPRIVATE_H diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadsymbianwrapper_p_stub.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/inc/dialpadsymbianwrapper_p_stub.h Fri Apr 16 15:31:58 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 DIALPADSYMBIANWRAPPERPRIVATE_H +#define DIALPADSYMBIANWRAPPERPRIVATE_H + +#include +#include + +class DialpadSymbianWrapper; + + +/*! + DialpadSymbianWrapperPrivate + +*/ +class DialpadSymbianWrapperPrivate +{ + +public: + + DialpadSymbianWrapperPrivate(DialpadSymbianWrapper *parent); + ~DialpadSymbianWrapperPrivate(); + + int getMailboxNumber(QString &vmbxNumber); + + int defineMailboxNumber(QString &vmbxNumber); + +private: + + DialpadSymbianWrapper *const q_ptr; + Q_DECLARE_PUBLIC(DialpadSymbianWrapper) + + int mTimes; +}; + +#endif // DIALPADSYMBIANWRAPPERPRIVATE_H diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/inc/dialpadvoicemailboxeventfilter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/inc/dialpadvoicemailboxeventfilter.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,104 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef DIALPADVOICEMAILBOXEVENTFILTER_H +#define DIALPADVOICEMAILBOXEVENTFILTER_H + +#include + +class QTimer; +class Dialpad; +class DialpadSymbianWrapper; + +/*! + DialpadVoiceMailboxEventFilter + Class provides voice mailbox key handling. +*/ +class DialpadVoiceMailboxEventFilter : public QObject +{ + Q_OBJECT + +public: + explicit DialpadVoiceMailboxEventFilter(Dialpad* dialpad, QObject* parent = 0); + virtual ~DialpadVoiceMailboxEventFilter(); + +protected: + bool eventFilter(QObject *watched, QEvent *event); + +private slots: + /*! + \fn void handleLongKeyPress() + + Handles long key presses. + */ + void handleLongKeyPress(); + +private: + /*! + \fn bool isLongKeyPressSupported(const int key) + + Checks if key is numeric key'1' or numbersign key if it is then + function return true, if key is something else for example + yes/send then this returns false. + */ + bool isLongKeyPressSupported(const int key); + + /*! + \fn bool checkIfSendEventAndConsumeEvent(const int pressedKey, const int eventType) + + Checks that keycode is call related key if it is then handle it. + */ + bool checkIfSendEventAndConsumeEvent(const int pressedKey, const int eventType); + + /*! + \fn bool handleCallButtonPress() + + Check if editor has number string and if it does then createCall + is called and funtion returns true, if there is no number then + funtion return false. + */ + bool handleCallButtonPress(); + + /*! + \fn void clearEditor() + + Clears dialpad editor. + */ + void clearEditor(); + + /*! + \fn createCall(const QString phoneNumber) + + Creates call request to QT Highway. + */ + void createCall(const QString &phoneNumber); + + /*! + \fn handleMailboxOperation + + Start vmbx call or number definition procedures. + */ + void handleMailboxOperation(); + +private: + QTimer *mLongPressTimer; + DialpadSymbianWrapper *mSymbianWrapper; + Dialpad* mDialpad; + int mKeyEvent; +}; + +#endif // DIALPADVOICEMAILBOXEVENTFILTER_H diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/dialpad.qrc --- a/telutils/dialpad/resources/dialpad.qrc Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - qtg_mono_voice_mailbox.svg - qtg_mono_answer_call.svg - dialpad.css - dialpad.dialpadbutton.widgetml - qtg_fr_btn_green_pressed_tr.svg - qtg_fr_btn_green_normal_b.svg - qtg_fr_btn_green_normal_bl.svg - qtg_fr_btn_green_normal_br.svg - qtg_fr_btn_green_normal_c.svg - qtg_fr_btn_green_normal_l.svg - qtg_fr_btn_green_normal_r.svg - qtg_fr_btn_green_normal_t.svg - qtg_fr_btn_green_normal_tl.svg - qtg_fr_btn_green_normal_tr.svg - qtg_fr_btn_green_pressed_b.svg - qtg_fr_btn_green_pressed_bl.svg - qtg_fr_btn_green_pressed_br.svg - qtg_fr_btn_green_pressed_c.svg - qtg_fr_btn_green_pressed_l.svg - qtg_fr_btn_green_pressed_r.svg - qtg_fr_btn_green_pressed_t.svg - qtg_fr_btn_green_pressed_tl.svg - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_b.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_b.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_bl.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_bl.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_br.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_br.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_c.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_c.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - -]> - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_l.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_l.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_r.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_r.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_t.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_t.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_tl.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_tl.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_normal_tr.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_normal_tr.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_b.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_b.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_bl.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_bl.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_br.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_br.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_c.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_c.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - -]> - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_l.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_l.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_r.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_r.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_t.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_t.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_tl.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_tl.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_fr_btn_green_pressed_tr.svg --- a/telutils/dialpad/resources/qtg_fr_btn_green_pressed_tr.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_mono_answer_call.svg --- a/telutils/dialpad/resources/qtg_mono_answer_call.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - - - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/resources/qtg_mono_voice_mailbox.svg --- a/telutils/dialpad/resources/qtg_mono_voice_mailbox.svg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - - - -]> - - - - - - diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpad.cpp --- a/telutils/dialpad/src/dialpad.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/src/dialpad.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -31,20 +31,49 @@ #include "dialpadkeypad.h" #include "dialpadbutton.h" #include "dialpadmultitaphandler.h" +#include "dialpadbackground.h" -static const QString backgroundGraphics(":/inputmethods/qtg_fr_input_bg"); -static const QString minimizeIcon(":/inputmethods/qtg_mono_input_down"); -static const qreal DialpadCloseSwipeDistance = 0.25; //compared to total height +static const QString backgroundGraphics("qtg_fr_input_bg"); +static const QString backgroundGraphicsH("qtg_fr_input_h_bg"); +static const QString minimizeIcon("qtg_graf_input_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 = 400; // 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 -Dialpad::Dialpad() : mMouseButtonPressedDown(false), - mOpenTimeLine(DialpadOpenAnimDuration), - mCloseTimeLine(DialpadCloseAnimDuration), - mAnimationOngoing(false) +Dialpad::Dialpad() : + mMainWindow(*hbInstance->allMainWindows().at(0)), + mBackgroundItem(0), + mMouseButtonPressedDown(false), + mOpenTimeLine(DialpadOpenAnimDuration), + mCloseTimeLine(DialpadCloseAnimDuration), + mAnimationOngoing(false), + mOrientation(Qt::Vertical), + mIsOpen(false) +{ + // this constuctor is deprecated + initialize(); +} + +Dialpad::Dialpad(const HbMainWindow& mainWindow) : + mMainWindow(mainWindow), + mBackgroundItem(0), + mMouseButtonPressedDown(false), + mOpenTimeLine(DialpadOpenAnimDuration), + mCloseTimeLine(DialpadCloseAnimDuration), + mAnimationOngoing(false), + mOrientation(Qt::Vertical), + mIsOpen(false) +{ + initialize(); +} + +void Dialpad::initialize() { setFocusPolicy(Qt::StrongFocus); setFlag(QGraphicsItem::ItemIsFocusable,true); @@ -53,28 +82,25 @@ mInputField = new DialpadInputField(this); // create keypad - mKeypad = new DialpadKeypad(*mInputField,this); + mKeypad = new DialpadKeypad(mMainWindow,*mInputField,this); mKeypad->setLongPressDuration(DialpadMaxSwipeTime); // layouting params qreal unit = HbDeviceProfile::current().unitValue(); qreal margin = DialpadComponentMargin * unit; mCloseHandleHeight = DialpadCloseHandleHeight * unit; + mCloseHandleWidth = DialpadCloseHandleWidth * unit; - // create popup close handler and background - QGraphicsWidget* closeHandle = new QGraphicsWidget(this); - closeHandle->setPreferredHeight(mCloseHandleHeight); - closeHandle->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed); + // create popup background mBackgroundDrawer = new HbFrameDrawer(); mIconDrawer = new HbFrameDrawer(); // popup layout QGraphicsLinearLayout* popupLayout - = new QGraphicsLinearLayout(Qt::Vertical); - popupLayout->addItem(closeHandle); + = new QGraphicsLinearLayout(mMainWindow.orientation()); popupLayout->addItem(mInputField); - popupLayout->addItem(mKeypad); - popupLayout->setContentsMargins(margin, 0, margin, margin); + popupLayout->addItem(mKeypad); + popupLayout->setContentsMargins(margin, mCloseHandleHeight, margin, margin); popupLayout->setSpacing(margin); setLayout(popupLayout); @@ -101,6 +127,7 @@ setPreferredSize(360,360); setZValue(0x00004000); // Hb PopupZValueRangeStart hide(); + mMainWindow.scene()->addItem(this); // custom button style HbStyleLoader::registerFilePath(":/dialpad.css"); @@ -111,9 +138,9 @@ { delete mBackgroundDrawer; delete mIconDrawer; + delete mBackgroundItem; } - void Dialpad::paint( QPainter* painter, const QStyleOptionGraphicsItem* option, @@ -123,36 +150,82 @@ Q_UNUSED(widget); // paint popup background - mBackgroundDrawer->setFrameGraphicsName(backgroundGraphics); - mBackgroundDrawer->setFrameType(HbFrameDrawer::ThreePiecesVertical); - mBackgroundDrawer->setFillWholeRect(true); + if ( mOrientation == Qt::Vertical ) { + mBackgroundDrawer->setFrameGraphicsName(backgroundGraphics); + mIconDrawer->setFrameGraphicsName(minimizeIcon); + mBackgroundDrawer->setFrameType(HbFrameDrawer::ThreePiecesVertical); + mBackgroundDrawer->setBorderWidths(0.0, mCloseHandleHeight, 0.0, 0.0); + } else { + mBackgroundDrawer->setFrameGraphicsName(backgroundGraphicsH); + mIconDrawer->setFrameGraphicsName(minimizeIconH); + mBackgroundDrawer->setFrameType(HbFrameDrawer::ThreePiecesHorizontal); + mBackgroundDrawer->setBorderWidths(mCloseHandleHeight, 0.0, 0.0, 0.0); + } + // draw background QRectF rect = boundingRect(); - mBackgroundDrawer->setBorderWidths(0.0, mCloseHandleHeight, 0.0, - (rect.height()-mCloseHandleHeight)/2.0); + mBackgroundDrawer->setFillWholeRect(true); mBackgroundDrawer->paint(painter, rect); + // adjust rectangle to close bar position + if ( mOrientation == Qt::Vertical ) { + rect.setLeft((rect.width()- mCloseHandleWidth)/2); + rect.setWidth(mCloseHandleWidth); + rect.setHeight(mCloseHandleHeight); + } else { + if (layoutDirection()==Qt::LeftToRight) { + rect.setTop((rect.height() - mCloseHandleWidth)/2); + rect.setWidth(mCloseHandleHeight); + rect.setHeight(mCloseHandleWidth); + } else { + rect.setLeft((rect.width() - mCloseHandleHeight)); + rect.setTop((rect.height() - mCloseHandleWidth)/2); + rect.setWidth(mCloseHandleHeight); + rect.setHeight(mCloseHandleWidth); + } + } + mIconDrawer->setFrameType(HbFrameDrawer::OnePiece); - rect.setLeft((rect.width() - mCloseHandleHeight)/2); - rect.setWidth(mCloseHandleHeight); - rect.setHeight(mCloseHandleHeight); - mIconDrawer->setFrameGraphicsName(minimizeIcon); mIconDrawer->paint(painter, rect); } +bool Dialpad::isOpen() const +{ + return mIsOpen; +} + void Dialpad::openDialpad() { - HbMainWindow* window = hbInstance->allMainWindows().at(0); - window->scene()->addItem(this); - connect(window,SIGNAL(aboutToChangeOrientation()), + if (mIsOpen) { + return; + } + + connect(&mMainWindow,SIGNAL(aboutToChangeOrientation()), SLOT(orientationChangeStarted())); - connect(window,SIGNAL(orientationChanged(Qt::Orientation)), - SLOT(orientationChangeFinished())); + connect(&mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)), + SLOT(orientationChangeFinished(Qt::Orientation))); // set offset for open animation + int previousOrientation = mOrientation; + mOrientation = mMainWindow.orientation(); + mPosition = pos(); - qreal height = geometry().height(); - setPos(mPosition.x(),mPosition.y()+height); + if (mOrientation==Qt::Vertical) { + qreal height = geometry().height(); + setPos(mPosition.x(),mPosition.y()+height); + } else { + qreal width = geometry().width(); + if (layoutDirection()==Qt::LeftToRight) { + setPos(mPosition.x()+width,mPosition.y()); + } else { + setPos(mPosition.x()-width,mPosition.y()); + } + } + + if (mOrientation!=previousOrientation) { + mKeypad->createButtonGrid(); + updateLayout((Qt::Orientation)mOrientation); + } show(); @@ -161,17 +234,27 @@ mOpenTimeLine.start(); mAnimationOngoing = true; + if (!mInputField->editor().text().isEmpty()) { + setCallButtonEnabled(true); + } + mIsOpen = true; + + emit aboutToOpen(); } void Dialpad::closeDialpad() { close(); - HbMainWindow* window = hbInstance->allMainWindows().at(0); - window->scene()->removeItem(this); - disconnect(window,SIGNAL(aboutToChangeOrientation())); - disconnect(window,SIGNAL(orientationChanged(Qt::Orientation))); -} + disconnect(&mMainWindow,SIGNAL(aboutToChangeOrientation()), + this, SLOT(orientationChangeStarted())); + disconnect(&mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)), + this, SLOT(orientationChangeFinished(Qt::Orientation))); + + if (mBackgroundItem) { + mBackgroundItem->hide(); + } +} HbLineEdit& Dialpad::editor() const { @@ -183,6 +266,25 @@ mKeypad->setCallButtonEnabled(enabled); } +void Dialpad::setTapOutsideDismiss(bool dismiss) +{ + // set dismiss policy before opening dialpad + Q_ASSERT(!isVisible()); + + if (dismiss) { + mBackgroundItem = new DialpadBackground(*this); + mBackgroundItem->setZValue(zValue()-1); + mMainWindow.scene()->addItem(mBackgroundItem); + qreal chromeHeight = 0; + hbInstance->style()->parameter("hb-param-widget-chrome-height", + chromeHeight); + mTitleBarHeight = chromeHeight; + } else { + delete mBackgroundItem; + mBackgroundItem = 0; + } +} + bool Dialpad::sceneEvent(QEvent *event) { return handleSceneEvent(event); @@ -211,19 +313,38 @@ QPointF delta = mouseEvent->scenePos() - mouseEvent->buttonDownScenePos(Qt::LeftButton); - qreal height = geometry().height() * DialpadCloseSwipeDistance; + if (mOrientation==Qt::Vertical) { + qreal height = geometry().height() * DialpadCloseSwipeDistanceV; - if ( (delta.y() >= height) && - (mSwipeTimer.elapsed() <= DialpadMaxSwipeTime) && - !mAnimationOngoing) { - mCloseTimeLine.start(); - mAnimationOngoing = true; + 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) { + mCloseTimeLine.start(); + mAnimationOngoing = true; + } +} + void Dialpad::showEvent(QShowEvent *event) { HbWidget::showEvent(event); @@ -231,6 +352,11 @@ // for closing swipe gesture installSceneEventFilter(this); setFiltersChildEvents(true); + + if (mBackgroundItem) { + layoutBackgroundItem(); + mBackgroundItem->show(); + } } void Dialpad::hideEvent(QHideEvent *event) @@ -242,6 +368,7 @@ void Dialpad::closeEvent(QCloseEvent * event) { + mIsOpen = false; HbWidget::closeEvent(event); emit aboutToClose(); } @@ -250,10 +377,23 @@ { QPointF currentPos = pos(); QPointF newPos; - qreal height = geometry().height(); + + if (mOrientation==Qt::Vertical) { + qreal height = geometry().height(); + + newPos.setX(currentPos.x()); + newPos.setY(mPosition.y()+(height*value)); + } else { + qreal width = geometry().width(); - newPos.setX(currentPos.x()); - newPos.setY(mPosition.y()+(height*value)); + if (layoutDirection()==Qt::LeftToRight) { + newPos.setY(currentPos.y()); + newPos.setX(mPosition.x()+(width*value)); + } else { + newPos.setY(currentPos.y()); + newPos.setX(mPosition.x()-(width*value)); + } + } setPos(newPos); } @@ -270,10 +410,23 @@ { QPointF currentPos = pos(); QPointF newPos; - qreal height = geometry().height(); + + if (mOrientation==Qt::Vertical) { + qreal height = geometry().height(); + + newPos.setX(currentPos.x()); + newPos.setY(mPosition.y()+(height*(1-value))); + } else { + qreal width = geometry().width(); - newPos.setX(currentPos.x()); - newPos.setY(mPosition.y()+(height*(1-value))); + if (layoutDirection()==Qt::LeftToRight) { + newPos.setY(currentPos.y()); + newPos.setX(mPosition.x()+(width*(1-value))); + } else { + newPos.setY(currentPos.y()); + newPos.setX(mPosition.x()-(width*(1-value))); + } + } setPos(newPos); } @@ -281,7 +434,7 @@ void Dialpad::openAnimFinished() { mAnimationOngoing = false; - setPos(mPosition); + setPos(mPosition); } void Dialpad::orientationChangeStarted() @@ -292,7 +445,49 @@ mKeypad->createButtonGrid(); } -void Dialpad::orientationChangeFinished() +void Dialpad::orientationChangeFinished(Qt::Orientation current) +{ + updateLayout(current); + + show(); + + mOrientation = current; + + mPosition = pos(); + + if (mBackgroundItem) { + layoutBackgroundItem(); + } +} + +void Dialpad::layoutBackgroundItem() { - show(); + Q_ASSERT(mBackgroundItem); + QRectF backgroundRect(mMainWindow.layoutRect()); + backgroundRect.adjust(0,mTitleBarHeight,0,0); + mBackgroundItem->setRect(backgroundRect); } + +void Dialpad::updateLayout(Qt::Orientation orientation) +{ + Q_ASSERT(layout()); + + qreal unit = HbDeviceProfile::current().unitValue(); + qreal margin = DialpadComponentMargin * unit; + + QGraphicsLinearLayout* mainLayout = + static_cast(layout()); + + // close handle location changes, update margin values + if (orientation==Qt::Vertical) { + mainLayout->setContentsMargins(margin, + mCloseHandleHeight, + margin, + margin); + } else { + mainLayout->setContentsMargins(mCloseHandleHeight, + margin, + margin, + margin); + } +} diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadbackground.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadbackground.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,77 @@ +/*! +* 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: Background item to close dialpad when tapping outside. +* +*/ + +#include +#include "dialpadbackground.h" +#include "dialpad.h" + +DialpadBackground::DialpadBackground(Dialpad& dialpad) : + mDialpad(dialpad), mPressed(false) +{ + setFlag(QGraphicsItem::ItemIsFocusable,true); +} + +DialpadBackground::~DialpadBackground() +{ + +} + +void DialpadBackground::setRect(QRectF rect) +{ + mRect = rect; +} + +QRectF DialpadBackground::boundingRect() const +{ + return mRect; +} + +void DialpadBackground::paint( + QPainter *painter, + const QStyleOptionGraphicsItem *option, + QWidget *widget) +{ + Q_UNUSED(painter); + Q_UNUSED(option); + Q_UNUSED(widget); +} + +void DialpadBackground::mousePressEvent(QGraphicsSceneMouseEvent * event) +{ + mPressed = true; + event->accept(); +} + +void DialpadBackground::mouseMoveEvent(QGraphicsSceneMouseEvent *event) +{ + if ( !boundingRect().contains(event->pos()) && mPressed ) { + ungrabMouse(); + mPressed = false; + } +} + +void DialpadBackground::mouseReleaseEvent(QGraphicsSceneMouseEvent * event) +{ + if (mPressed) { + mPressed = false; + event->accept(); + mDialpad.startCloseAnimation(); + } +} + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadbluetootheventfilter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadbluetootheventfilter.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,75 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include +#include +#include "dialpadbluetootheventfilter.h" +#include "dialpad.h" +#include "qtphonesrvlog.h" + +#ifdef Q_OS_SYMBIAN +#include +#endif //Q_OS_SYMBIAN + +const int DialpadLongKeyPressTimeOut(1000); +const QString BluetoothCharacter("*"); + +DialpadBluetoothEventFilter::DialpadBluetoothEventFilter(Dialpad* dialpad, QObject* parent) : + QObject(parent), mDialpad(dialpad) +{ + PHONE_TRACE; + mLongPressTimer = new QTimer(this); + mLongPressTimer->setSingleShot(true); + connect(mLongPressTimer,SIGNAL(timeout()), this, SLOT(toggleBluetooth())); +} + +DialpadBluetoothEventFilter::~DialpadBluetoothEventFilter() +{ +} + +bool DialpadBluetoothEventFilter::eventFilter(QObject *watched, QEvent *event) +{ + Q_UNUSED(watched) + QKeyEvent *keyEvent = static_cast(event); + const int keyCode = keyEvent->key(); + const int eventType = event->type(); + + if (eventType == QEvent::KeyPress && keyCode == Qt::Key_Asterisk) { + if (!(mDialpad->editor().text().length() >= 1)) { + //Check that there is only one item in dialpad, if there is more than one + //do not handle long key press. + mLongPressTimer->stop(); + mLongPressTimer->start(DialpadLongKeyPressTimeOut); + } + } else if (eventType == QEvent::KeyRelease) { + mLongPressTimer->stop(); + } + + // Don't consume the key + return false; +} + +void DialpadBluetoothEventFilter::toggleBluetooth() +{ + PHONE_TRACE; + mDialpad->editor().setText(QString("")); +#ifdef Q_OS_SYMBIAN + XQServiceRequest snd("com.nokia.services.btservices.ToggleBluetooth","toggleBluetooth()", false); + QVariant retValue; + snd.send(retValue); +#endif // Q_OS_SYMBIAN +} diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadbuttonstyle.cpp --- a/telutils/dialpad/src/dialpadbuttonstyle.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/src/dialpadbuttonstyle.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -66,21 +66,21 @@ frameGraphicsName = "qtg_fr_btn_disabled"; } else if (mode == QIcon::Normal && state == QIcon::On) { if (mButtonStyle==CallButtonStyle) { - frameGraphicsName = ":/qtg_fr_btn_green_pressed"; + frameGraphicsName = "qtg_fr_btn_green_pressed"; } else if (mButtonStyle==NormalButtonStyle) { - frameGraphicsName = "qtg_fr_button_keypad_pressed"; + frameGraphicsName = "qtg_fr_input_btn_keypad_pressed"; } else { - frameGraphicsName = "qtg_fr_button_function_pressed"; + frameGraphicsName = "qtg_fr_input_btn_function_pressed"; } } else if (mode == QIcon::Selected && state == QIcon::Off) { frameGraphicsName = "qtg_fr_btn_highlight"; } else { if (mButtonStyle==CallButtonStyle) { - frameGraphicsName = ":/qtg_fr_btn_green_normal"; + frameGraphicsName = "qtg_fr_btn_green_normal"; } else if (mButtonStyle==NormalButtonStyle) { - frameGraphicsName = "qtg_fr_button_keypad_normal"; + frameGraphicsName = "qtg_fr_input_btn_keypad_normal"; } else { - frameGraphicsName = "qtg_fr_button_function_normal"; + frameGraphicsName = "qtg_fr_input_btn_function_normal"; } } @@ -115,19 +115,19 @@ if (mButtonStyle==CallButtonStyle && mode == QIcon::Normal) { if (state==QIcon::On) { - QColor color(HbColorScheme::color("answer_pressed")); + QColor color(HbColorScheme::color("qtc_callhandling_answer_pressed")); setIconColor(item,color); } else { - QColor color(HbColorScheme::color("answer_normal")); + QColor color(HbColorScheme::color("qtc_callhandling_answer_normal")); setIconColor(item,color); } } else if (mButtonStyle==NormalButtonStyle) { QColor color; - color = HbColorScheme::color("input_button_normal"); + color = HbColorScheme::color("qtc_input_button_normal"); setIconColor(item,color); } else { // function button QColor color; - color = HbColorScheme::color("input_function_normal"); + color = HbColorScheme::color("qtc_input_function_normal"); setIconColor(item,color); } break; @@ -163,7 +163,7 @@ HbTextItem *textPrim = qgraphicsitem_cast(item); if (textPrim) { QColor color; - color = HbColorScheme::color("input_button_normal"); + color = HbColorScheme::color("qtc_input_button_normal"); if (color.isValid()) { textPrim->setTextColor(color); } else { diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadinputfield.cpp --- a/telutils/dialpad/src/dialpadinputfield.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/src/dialpadinputfield.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -26,12 +26,13 @@ #include "dialpadbuttonstyle.h" #include "dialpadbutton.h" -static const QString HbBackspaceIcon(":/inputmethods/qtg_mono_backspace2"); +static const QString HbBackspaceIcon("qtg_mono_backspace2"); static const int DialpadAutoRepeatInterval = 150; // ms static const int DialpadAutoRepeatDelay = 1000; // ms static const qreal DialpadComponentMargin = 0.75; // units static const qreal DialpadBackspaceHeight = 9.4; // units static const qreal DialpadInputFieldHeight = 6.3; // units +static const int DialpadMaxEditStringLenght = 100; DialpadInputField::DialpadInputField(QGraphicsItem* parent) : HbWidget(parent) @@ -42,6 +43,7 @@ editorInterface.setFilter(HbPhoneNumberFilter::instance()); editorInterface.setUpAsPhoneNumberEditor(); editorInterface.setConstraints(HbEditorConstraintIgnoreFocus); + mNumberEditor->setMaxLength(DialpadMaxEditStringLenght); // create backspace button mBackspace = new DialpadButton(this); diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadkeyhandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadkeyhandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,39 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Custom button +* +*/ + +#include +#include "dialpadkeyhandler.h" +#include "dialpadvoicemailboxeventfilter.h" +#include "dialpadbluetootheventfilter.h" +#include "qtphonesrvlog.h" + +DialpadKeyHandler::DialpadKeyHandler(Dialpad *dialPad, HbMainWindow& mainWindow, QObject *parent) : QObject(parent), mMainWindow(mainWindow) +{ + PHONE_TRACE; + mVmbxFilter = new DialpadVoiceMailboxEventFilter(dialPad, this); + Q_ASSERT(mVmbxFilter != NULL); + mBtFilter = new DialpadBluetoothEventFilter(dialPad, this); + Q_ASSERT(mBtFilter != NULL); + + // Stack different event filters + mMainWindow.installEventFilter(mVmbxFilter); + mMainWindow.installEventFilter(mBtFilter); +} + +DialpadKeyHandler::~DialpadKeyHandler() +{ +} diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadkeypad.cpp --- a/telutils/dialpad/src/dialpadkeypad.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/src/dialpadkeypad.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -32,6 +32,8 @@ static const int DialpadRowCount = 5; static const int DialpadColumnCount = 3; +static const QString handsetIcon("qtg_mono_call"); +static const QString vmbxIcon("qtg_mono_voice_mailbox"); static const int DialpadButtonToKeyCodeTable[DialpadButtonCount] = { @@ -44,9 +46,12 @@ }; DialpadKeypad::DialpadKeypad( + const HbMainWindow& mainWindow, DialpadInputField& inputField, QGraphicsItem* parent) : - HbWidget(parent), mInputField(inputField), + HbWidget(parent), + mMainWindow(mainWindow), + mInputField(inputField), mLongPressDuration(0) { // create signal mappers @@ -86,14 +91,14 @@ if (keyCode==Qt::Key_Yes) { button->setStyle(mCallButtonStyle); - HbIcon callIcon(":/qtg_mono_answer_call.svg"); // todo correct icon + HbIcon callIcon(handsetIcon); // todo correct icon button->setIcon(callIcon); } else { button->setStyle(mNormalButtonStyle); } if (keyCode==Qt::Key_1) { - HbIcon mboxIcon(":/qtg_mono_voice_mailbox.svg"); + HbIcon mboxIcon(vmbxIcon); button->setIcon(mboxIcon); } @@ -258,7 +263,7 @@ void DialpadKeypad::postKeyEvent(QEvent::Type type, int key) { QKeyEvent *keyEvent = new QKeyEvent(type, key, Qt::NoModifier); - HbApplication::postEvent(hbInstance->allMainWindows().at(0),keyEvent); + HbApplication::postEvent(const_cast(&mMainWindow),keyEvent); } void DialpadKeypad::sendKeyEventToEditor(QEvent::Type type, int key) @@ -297,18 +302,21 @@ { HbWidget::showEvent(event); - // set fixed row and column dimensions - QSizeF effectiveSize(rect().width(), - rect().height()); - - qreal width = effectiveSize.width() / DialpadColumnCount; - qreal height = effectiveSize.height() / DialpadRowCount; + if (parentWidget()->isVisible()) { + // first show event comes before dialpad is open + // set fixed row and column dimensions + QSizeF effectiveSize(rect().width(), + rect().height()); - for (int i=0; i < DialpadColumnCount ;i++) { - mGridLayout->setColumnFixedWidth(i, width); - } + qreal width = effectiveSize.width() / DialpadColumnCount; + qreal height = effectiveSize.height() / DialpadRowCount; - for (int i=0; i < DialpadRowCount ;i++) { - mGridLayout->setRowFixedHeight(i, height); + for (int i=0; i < DialpadColumnCount ;i++) { + mGridLayout->setColumnFixedWidth(i, width); + } + + for (int i=0; i < DialpadRowCount ;i++) { + mGridLayout->setRowFixedHeight(i, height); + } } } diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadmultitaphandler.cpp --- a/telutils/dialpad/src/dialpadmultitaphandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/src/dialpadmultitaphandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -80,6 +80,15 @@ ++mAsteriskMultitapIndex % DialpadAsteriskMultitapCount; int key = DialpadAsteriskMultitapChars[mAsteriskMultitapIndex]; + + // Allow + character only as a first char in editor + int cursorPosition = mEditor.cursorPosition(); + if(cursorPosition != 0 && key == Qt::Key_Plus) { + mAsteriskMultitapIndex = ++mAsteriskMultitapIndex; + Q_ASSERT(mAsteriskMultitapIndex < DialpadAsteriskMultitapCount); + key = DialpadAsteriskMultitapChars[mAsteriskMultitapIndex]; + } + QKeyEvent generatedEvent(QEvent::KeyPress, key, Qt::KeypadModifier, mExtraChar.value(key)); diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadsymbianwrapper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadsymbianwrapper.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,44 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Provides information about ongoing calls. +* +*/ + +#include "dialpadsymbianwrapper.h" +#include "dialpadsymbianwrapper_p.h" + + +DialpadSymbianWrapper::DialpadSymbianWrapper(QObject *parent) : + QObject(parent), + d_ptr(new DialpadSymbianWrapperPrivate(this)) +{ +} + +DialpadSymbianWrapper::~DialpadSymbianWrapper() +{ + delete d_ptr; +} + +int DialpadSymbianWrapper::getMailboxNumber(QString &vmbxNumber) +{ + Q_D(DialpadSymbianWrapper); + return d_ptr->getMailboxNumber(vmbxNumber); +} + +int DialpadSymbianWrapper::defineMailboxNumber(QString &vmbxNumber) +{ + Q_D(DialpadSymbianWrapper); + return d_ptr->defineMailboxNumber(vmbxNumber); +} + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadsymbianwrapper_p.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadsymbianwrapper_p.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,81 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Provides information about ongoing calls. +* +*/ + +#include "dialpadsymbianwrapper.h" +#include "dialpadsymbianwrapper_p.h" +#include +#include + +DialpadSymbianWrapperPrivate::DialpadSymbianWrapperPrivate(DialpadSymbianWrapper *parent) : + q_ptr(parent) +{ + TRAPD(error, mVmbx = CVoiceMailbox::NewL()); + qt_symbian_throwIfError(error); +} + +DialpadSymbianWrapperPrivate::~DialpadSymbianWrapperPrivate() +{ + delete mVmbx; + mVmbx = NULL; +} + +int DialpadSymbianWrapperPrivate::getMailboxNumber(QString &vmbxNumber) +{ + int errValue(KErrNone); + CVoiceMailboxEntry* vmbxEntry = NULL; + TVoiceMailboxParams vmbxParams; + errValue = mVmbx->QueryVmbxType( vmbxParams ); + + if ((KErrNone == errValue) && + (KErrNone == mVmbx->GetStoredEntry(vmbxParams, vmbxEntry))) { + // Number retrieved succesfully: + vmbxNumber = getVmbxNumber(*vmbxEntry); + } + // Entry ownership was transferred. + delete vmbxEntry; + vmbxEntry = NULL; + return errValue; +} + + +int DialpadSymbianWrapperPrivate::defineMailboxNumber(QString &vmbxNumber) +{ + CVoiceMailboxEntry* vmbxEntry = NULL; + TVoiceMailboxParams vmbxParams; + int errValue = mVmbx->QueryVmbxType( vmbxParams ); + + if ((KErrNotFound == errValue)) { + errValue = mVmbx->QueryNewEntry(vmbxParams, vmbxEntry); + if (KErrNone == errValue) { + mVmbx->SaveEntry(*vmbxEntry); + // Do appropriate tasks, e.g. save number. + vmbxNumber = getVmbxNumber(*vmbxEntry); + } + } + return errValue; +} + +QString DialpadSymbianWrapperPrivate::getVmbxNumber(CVoiceMailboxEntry &vmbxEntry) +{ + TPtrC ptrNumber(KNullDesC); + QString dialpadText = NULL; + if(KErrNone == vmbxEntry.GetVmbxNumber(ptrNumber)) { + dialpadText = QString::fromUtf16(ptrNumber.Ptr(), ptrNumber.Length()); + } + return dialpadText; +} + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadsymbianwrapper_p_stub.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadsymbianwrapper_p_stub.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,71 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Provides information about ongoing calls. +* +*/ + +#include "dialpadsymbianwrapper.h" +#include "dialpadsymbianwrapper_p_stub.h" + +DialpadSymbianWrapperPrivate::DialpadSymbianWrapperPrivate(DialpadSymbianWrapper *parent) : + q_ptr(parent), + mTimes(0) +{ +} + +DialpadSymbianWrapperPrivate::~DialpadSymbianWrapperPrivate() +{ +} + +int DialpadSymbianWrapperPrivate::getMailboxNumber(QString &vmbxNumber) +{ + int errValue(0); + switch( mTimes ) { + case 0: + case 1:{ + errValue = -1; + break; + } + case 2:{ + errValue = 0; + break; + } + default: + break; + } + + return errValue; +} + +int DialpadSymbianWrapperPrivate::defineMailboxNumber(QString &vmbxNumber) +{ + int errValue(0); + + switch( mTimes ) { + case 0:{ + errValue = 0; + vmbxNumber.append("12345678"); + break; + } + case 1:{ + errValue = -3; + vmbxNumber.append(""); + break; + } + default: + break; + } + mTimes++; + return errValue; +} diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/src/dialpadvoicemailboxeventfilter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadvoicemailboxeventfilter.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,196 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include +#include +#include +#include "dialpadvoicemailboxeventfilter.h" +#include "dialpadsymbianwrapper.h" +#include "dialpad.h" +#include "qtphonesrvlog.h" + +#ifdef Q_OS_SYMBIAN +#include +#include +#endif //Q_OS_SYMBIAN + +const int DialpadLongKeyPressTimeOut(1000); +const QString VmbxCharacter("1"); + +enum err { + DialpadErrorNone = 0, + DialpadErrorCancel = -3 +}; + +const int DialpadLongKeyPressButtonCount(1); +static const int DialpadLongKeyPressSupportingButtons[DialpadLongKeyPressButtonCount] = +{ Qt::Key_1 }; + + +DialpadVoiceMailboxEventFilter::DialpadVoiceMailboxEventFilter(Dialpad* dialpad, QObject* parent) : + QObject(parent), mDialpad(dialpad), mKeyEvent(NULL) +{ + PHONE_TRACE; + mLongPressTimer = new QTimer(this); + mLongPressTimer->setSingleShot(true); + connect(mLongPressTimer,SIGNAL(timeout()),this,SLOT(handleLongKeyPress())); + mSymbianWrapper = new DialpadSymbianWrapper(this); +} + +DialpadVoiceMailboxEventFilter::~DialpadVoiceMailboxEventFilter() +{ +} + +bool DialpadVoiceMailboxEventFilter::eventFilter(QObject *watched, QEvent *event) +{ + Q_UNUSED(watched) + bool keyEventEaten(false); + + QKeyEvent *keyEvent = static_cast(event); + const int keyCode = keyEvent->key(); + const int eventType = event->type(); + + if (eventType == QEvent::KeyPress) { + if (checkIfSendEventAndConsumeEvent(keyCode, eventType)) { + keyEventEaten = true; + } else if ((isLongKeyPressSupported(keyCode)) && + !(mDialpad->editor().text().length() >= 1)) { + //Check that there is only one item in dialpad, if there is more than one + //do not handle long key press. + mLongPressTimer->stop(); + mLongPressTimer->start(DialpadLongKeyPressTimeOut); + } + } else if (eventType == QEvent::KeyRelease) { + if (checkIfSendEventAndConsumeEvent(keyCode, eventType)) { + keyEventEaten = true; + } else if (isLongKeyPressSupported(keyCode)){ + mLongPressTimer->stop(); + } + } + + return keyEventEaten; +} + +bool DialpadVoiceMailboxEventFilter::checkIfSendEventAndConsumeEvent(const int pressedKey, const int eventType) +{ + PHONE_TRACE4("pressedKey:", pressedKey, "eventType:", eventType); + bool sendKeyHandled(false); + // first check that pressed key is send key. + if (pressedKey == Qt::Key_Yes || + pressedKey == Qt::Key_Enter) { + if (eventType == QEvent::KeyPress) { + sendKeyHandled = handleCallButtonPress(); + } else if ((eventType == QEvent::KeyRelease) && + (!mDialpad->editor().text().isEmpty())) { + sendKeyHandled = true; + } + } + return sendKeyHandled; +} + +bool DialpadVoiceMailboxEventFilter::isLongKeyPressSupported(const int key) +{ + PHONE_TRACE2("key:", key); + bool longKeySupport(false); + // check if dialpad button is pressed. + for (int i = 0; i < DialpadLongKeyPressButtonCount; i++) { + if (key==DialpadLongKeyPressSupportingButtons[i]) { + longKeySupport = true; + // Save key code for handleCallButtonPress. + mKeyEvent = key; + } + } + return longKeySupport; +} + +void DialpadVoiceMailboxEventFilter::handleLongKeyPress() +{ + PHONE_TRACE; + switch(mKeyEvent) { + case Qt::Key_1:{ + handleMailboxOperation(); + break; + } + default: + // Do nothing. + break; + } + + // Reset key code. + mKeyEvent = NULL; +} + +bool DialpadVoiceMailboxEventFilter::handleCallButtonPress() +{ + PHONE_TRACE; + bool callButtonhandled(false); + if (!mDialpad->editor().text().isEmpty()) { +#ifdef Q_OS_SYMBIAN + // check if editor has '1' character if does then + // get MailboxNumber. + QString editorContent = HbStringUtil::convertDigitsTo( + mDialpad->editor().text(), WesternDigit); + if (VmbxCharacter==editorContent) { + handleMailboxOperation(); + callButtonhandled = true; + } +#endif //Q_OS_SYMBIAN + } + return callButtonhandled; +} + +void DialpadVoiceMailboxEventFilter::handleMailboxOperation() +{ + PHONE_TRACE; + QString mailboxNumber(NULL); + int error = mSymbianWrapper->getMailboxNumber(mailboxNumber); + // If here is no vmbx number and dialpad must start vmbx number definition procedures. + if (DialpadErrorNone != error) { + mDialpad->closeDialpad(); + // If define mailbox query was interupted than reopen dialpad. + error = mSymbianWrapper->defineMailboxNumber(mailboxNumber); + if (DialpadErrorCancel == error) { + mDialpad->openDialpad(); + } + } + // Valid vmbx number found or defined and there vmbx didnt + // return error values then create a call. + if ((DialpadErrorNone == error) && + (mailboxNumber.length() != 0)) { + createCall(mailboxNumber); + clearEditor(); + mDialpad->openDialpad(); + } +} + +void DialpadVoiceMailboxEventFilter::clearEditor() +{ + PHONE_TRACE; + // Erase data from dialpad editor. + mDialpad->editor().setText(NULL); +} + +void DialpadVoiceMailboxEventFilter::createCall(const QString &phoneNumber) +{ + PHONE_TRACE2("phoneNumber:", phoneNumber); +#ifdef Q_OS_SYMBIAN + XQServiceRequest snd("com.nokia.services.telephony","dial(QString)", false); + snd << phoneNumber; + QVariant retValue; + snd.send(retValue); +#endif // Q_OS_SYMBIAN +} diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,23 @@ + + + +]> + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,23 @@ + + + +]> + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,23 @@ + + + +]> + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,19 @@ + + + +]> + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,23 @@ + + + +]> + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,23 @@ + + + +]> + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,23 @@ + + + +]> + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,19 @@ + + + +]> + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,24 @@ + + + +]> + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_b.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_b.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_c.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_t.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_bg_t.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_swipe.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_graf_input_swipe.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_answer_call.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_answer_call.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,23 @@ + + + +]> + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,16 @@ + + + +]> + + + + + + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/dialpadtest/dialpadtestview.cpp --- a/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -29,9 +29,10 @@ #include "dialpadtestview.h" #include "dialpad.h" +#include "dialpadkeyhandler.h" DialpadTestView::DialpadTestView( HbMainWindow& mainWindow ) : - mMainWindow(mainWindow) + mMainWindow(mainWindow), mTapOutsideDismiss(0) { setTitle("DialpadTest"); @@ -52,6 +53,8 @@ SIGNAL(orientationChanged(Qt::Orientation)), SLOT(onOrientationChange(Qt::Orientation))); + menu()->addAction("Tap outside dismiss",this,SLOT(setTapOutsideDismiss())); + // create view widget (recent calls list mockup) createListWidget(); @@ -66,6 +69,9 @@ mLongPressTimer = new QTimer(this); mLongPressTimer->setSingleShot(true); connect(mLongPressTimer,SIGNAL(timeout()),this,SLOT(handleLongKeyPress())); + + mKeyhandler = new DialpadKeyHandler(mDialpad, mMainWindow, this); + mMainWindow.installEventFilter(this); } @@ -99,10 +105,16 @@ if (mMainWindow.orientation() == Qt::Horizontal) { // dialpad takes half of the screen - mDialpad->setPos(QPointF(screenRect.width()/2, - this->scenePos().y())); - mDialpad->setPreferredSize(screenRect.width()/2, - (screenRect.height()-scenePos().y())); + if (layoutDirection() == Qt::LeftToRight) { + mDialpad->setPos(QPointF(screenRect.width()/2, + this->scenePos().y())); + mDialpad->setPreferredSize(screenRect.width()/2, + (screenRect.height()-scenePos().y())); + } else { + mDialpad->setPos(QPointF(0,this->scenePos().y())); + mDialpad->setPreferredSize(screenRect.width()/2, + (screenRect.height()-scenePos().y())); + } } else { qreal screenHeight = screenRect.height(); mDialpad->setPos(0, screenHeight/2.25); @@ -143,7 +155,7 @@ phoneNum.append(index); listItem->setSecondaryText(phoneNum); HbIcon icon(":/qgn_prop_pb_comm_call_large.svg"); - listItem->setDecorationIcon(icon); + listItem->setIcon(icon); mListWidget->addItem(listItem); } setWidget(mListWidget); @@ -184,6 +196,15 @@ return false; } +bool DialpadTestView::event(QEvent * event) +{ + if (event->type() == QEvent::LayoutDirectionChange) { + setDialpadPosition(); + } + + return HbView::event(event); +} + void DialpadTestView::handleLongKeyPress() { HbMessageBox msgBox; @@ -213,3 +234,9 @@ msgBox.exec(); } + +void DialpadTestView::setTapOutsideDismiss() +{ + mTapOutsideDismiss = !mTapOutsideDismiss; + mDialpad->setTapOutsideDismiss(mTapOutsideDismiss); +} diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/dialpadtest/dialpadtestview.h --- a/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.h Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.h Fri Apr 16 15:31:58 2010 +0300 @@ -23,6 +23,7 @@ class HbMainWindow; class HbListWidget; class Dialpad; +class DialpadKeyHandler; class DialpadTestView : public HbView { @@ -34,6 +35,7 @@ protected: bool eventFilter(QObject * watched, QEvent * event); + bool event(QEvent * event); private: void createListWidget(); @@ -47,13 +49,16 @@ void onOrientationChange(Qt::Orientation orientation); void onEditorContentChanged(); void handleLongKeyPress(); + void setTapOutsideDismiss(); private: HbMainWindow& mMainWindow; HbListWidget* mListWidget; Dialpad* mDialpad; + DialpadKeyHandler *mKeyhandler; QTimer* mLongPressTimer; QString mPressedKey; + bool mTapOutsideDismiss; }; #endif // DIALPADTESTVIEW_H diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/checkcoverage.cmd --- a/telutils/dialpad/tsrc/unit/checkcoverage.cmd Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/tsrc/unit/checkcoverage.cmd Fri Apr 16 15:31:58 2010 +0300 @@ -34,7 +34,14 @@ ..\%1\%1.pro call mingw32-make^ debug +if "%2"=="mt_keyhandler" ( +call qmake^ + ..\%2\%2.pro +call mingw32-make^ + debug +) call %1.exe +call %2.exe ) if not "%1"=="mt_dialpad" ( diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.cpp --- a/telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/tsrc/unit/mt_dialpad/mt_dialpad.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -82,6 +82,13 @@ void testCallButton(); void testCloseGesture(); void testOpenDialogWhileButtonPressed(); + void testTapOutsideDismiss(); + +#ifndef Q_OS_SYMBIAN + void testCloseGestureLandscape(); + void testCloseGestureLandscapeMirrored(); + void testOrientationChange(); +#endif private: QGraphicsWidget* getWidgetByName(const QString& name); @@ -102,14 +109,15 @@ mKeyCatcher = new KeyEventCatcher; mMainWindow->installEventFilter(mKeyCatcher); - mDialpad = new Dialpad(); + mDialpad = new Dialpad(*mMainWindow); QRectF rect(mMainWindow->contentsRect()); rect.setHeight(rect.height()*0.7); rect.moveTop((mMainWindow->contentsRect().height()-rect.height())/2); - mDialpad->setPreferredSize(360,400); - mDialpad->setPos(0,100); + mDialpad->setPreferredSize(mMainWindow->layoutRect().width(), + mMainWindow->layoutRect().height()/2); + mDialpad->setPos(0,mMainWindow->layoutRect().height()/4); mKeyNames.insert(Qt::Key_1,"49"); mKeyNames.insert(Qt::Key_2,"50"); @@ -198,7 +206,13 @@ void mt_Dialpad::testNumericButtons() { + QSignalSpy aboutToOpenSpy( mDialpad, SIGNAL(aboutToOpen())); + QSignalSpy aboutToCloseSpy( mDialpad, SIGNAL(aboutToClose())); + + QVERIFY(mDialpad->isOpen()==false); mDialpad->openDialpad(); + QVERIFY(mDialpad->isOpen()==true); + QVERIFY(aboutToOpenSpy.count()==1); QTest::qWait( 2*WAIT_TIME ); mouseClickDialpad(Qt::Key_1); @@ -223,6 +237,8 @@ QVERIFY(mKeyCatcher->mKeyPresses.at(11)==Qt::Key_NumberSign); QVERIFY(mKeyCatcher->mKeyReleases.at(11)==Qt::Key_NumberSign); mDialpad->closeDialpad(); + QVERIFY(mDialpad->isOpen()==false); + QVERIFY(aboutToCloseSpy.count()==1); } void mt_Dialpad::testNumericButtonLongPress() @@ -281,12 +297,24 @@ QVERIFY(mKeyCatcher->mKeyPresses.at(2)==Qt::Key_Asterisk); QVERIFY(mKeyCatcher->mKeyReleases.at(2)==Qt::Key_Asterisk); + // Verify that the second char can't be + + QTest::qWait(1000); + mouseClickDialpad(Qt::Key_Asterisk); + QCOMPARE(mDialpad->editor().text(), QString("w*")); + mouseClickDialpad(Qt::Key_Asterisk); + QCOMPARE(mDialpad->editor().text(), QString("wp")); + mouseClickDialpad(Qt::Key_Asterisk); + QCOMPARE(mDialpad->editor().text(), QString("ww")); + 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); QTest::qWait( 1000 ); // longer than short tap mouseClickDialpad(Qt::Key_Asterisk); - QVERIFY(mDialpad->editor().text()=="**"); + QCOMPARE(mDialpad->editor().text(), QString("**")); mDialpad->closeDialpad(); } @@ -311,6 +339,8 @@ void mt_Dialpad::testCloseGesture() { + QSignalSpy aboutToCloseSpy( mDialpad, SIGNAL(aboutToClose())); + mDialpad->openDialpad(); // slow swipe @@ -318,7 +348,7 @@ mouseClickDialpad(Qt::Key_2, Press, false); QTest::qWait( 500 ); // longer than swipe mouseClickDialpad(Qt::Key_8, Release, false); - QTest::qWait( WAIT_TIME ); + QTest::qWait( 500 ); QVERIFY(mDialpad->isVisible()==true); // short swipe @@ -326,7 +356,7 @@ mouseClickDialpad(Qt::Key_2, Press, false); QTest::qWait( 200 ); mouseClickDialpad(Qt::Key_5, Release, false); - QTest::qWait( WAIT_TIME ); + QTest::qWait( 500 ); QVERIFY(mDialpad->isVisible()==true); // ok swipe @@ -338,6 +368,7 @@ QVERIFY(mDialpad->editor().text()==""); QTest::qWait( 1000 ); QVERIFY(mDialpad->isVisible()==false); + QVERIFY(aboutToCloseSpy.count()==1); } void mt_Dialpad::testOpenDialogWhileButtonPressed() @@ -356,6 +387,133 @@ mDialpad->closeDialpad(); } +void mt_Dialpad::testTapOutsideDismiss() +{ + mDialpad->openDialpad(); + QTest::qWait( WAIT_TIME ); + + QPointF aboveTop = mDialpad->scenePos(); + aboveTop.setY(aboveTop.y()-10); + aboveTop.setX(aboveTop.x()+mDialpad->rect().center().x()); + QPoint windowPos = mMainWindow->mapFromScene( aboveTop ); + + // test tap outside dismiss is OFF (default) + QTest::mouseClick( mMainWindow->viewport(), Qt::LeftButton, + 0, windowPos ); + QTest::qWait( 500 ); + QVERIFY(mDialpad->isVisible()); + mDialpad->closeDialpad(); + + // test tap outside dismiss is ON + mDialpad->setTapOutsideDismiss(true); + mDialpad->openDialpad(); + QTest::qWait( WAIT_TIME ); + QTest::mouseClick( mMainWindow->viewport(), Qt::LeftButton, + 0, windowPos ); + QTest::qWait( 500 ); + QVERIFY(!mDialpad->isVisible()); +} + +#ifndef Q_OS_SYMBIAN +void mt_Dialpad::testCloseGestureLandscape() +{ + // switch to landscape + 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); + + mDialpad->openDialpad(); + + // slow swipe + QTest::qWait( WAIT_TIME ); + mouseClickDialpad(Qt::Key_4, Press, false); + QTest::qWait( 500 ); // longer than swipe + 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); + 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_4, Press, false); + QTest::qWait( 200 ); + mouseClickDialpad(Qt::Key_6, Release, false); + QVERIFY(mDialpad->editor().text()==""); + QTest::qWait( 1000 ); + QVERIFY(mDialpad->isVisible()==false); +} + +void mt_Dialpad::testCloseGestureLandscapeMirrored() +{ + // switch to mirrored landscape + mMainWindow->setOrientation(Qt::Horizontal); + mMainWindow->resize(640,360); + mMainWindow->setLayoutDirection(Qt::RightToLeft); + QTest::qWait( 1000 ); + + mDialpad->setPos(0,0); + + mDialpad->openDialpad(); + + // slow swipe + QTest::qWait( WAIT_TIME ); + mouseClickDialpad(Qt::Key_4, Press, false); + QTest::qWait( 500 ); // longer than swipe + 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); + QTest::qWait( 200 ); + 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); + QTest::qWait( 200 ); + mouseClickDialpad(Qt::Key_6, Release, false); + QVERIFY(mDialpad->editor().text()==""); + QTest::qWait( 1000 ); + QVERIFY(mDialpad->isVisible()==false); +} + +void mt_Dialpad::testOrientationChange() +{ + mDialpad->openDialpad(); + QTest::qWait( WAIT_TIME ); + mMainWindow->setLayoutDirection(Qt::LeftToRight); + 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->closeDialpad(); + QTest::qWait( 500 ); + QVERIFY(mDialpad->isVisible()==false); +} + +#endif //Q_OS_SYMBIAN + DIALPAD_TEST_MAIN(mt_Dialpad) #include "mt_dialpad.moc" diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,81 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "dialpadtest.h" +#include "dialpad.h" +#include "dialpadkeyhandler.h" +#include "dialpadvoicemailboxeventfilter.h" + +bool mVmbxFilterConstructed; +Dialpad* mParameter1; +QObject* mParameter2; + +#ifdef Q_OS_SYMBIAN +DialpadVoiceMailboxEventFilter::DialpadVoiceMailboxEventFilter(Dialpad* dialPad, QObject* parent) +{ + mVmbxFilterConstructed = true; + mParameter1 = dialPad; + mParameter2 = parent; +} +#endif + +// test cases +class mt_KeyHandler : public QObject +{ + Q_OBJECT + +private slots: + void init(); + void cleanup(); + +private: + HbMainWindow* mMainWindow; + Dialpad* mDialpad; + DialpadKeyHandler *mKeyhandler; +}; + +void mt_KeyHandler::init() +{ + mVmbxFilterConstructed = false; + 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); +} + +void mt_KeyHandler::cleanup() +{ + delete mDialpad; + delete mMainWindow; +} + + +DIALPAD_TEST_MAIN(mt_KeyHandler) +#include "mt_keyhandler.moc" diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.pro Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,35 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +# + +TEMPLATE = app +TARGET = +INCLUDEPATH += . ../../../inc ../shared + +CONFIG += hb qtestlib + +symbian { + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +} else:win32 { + DESTDIR = ./ + INCLUDEPATH += ../../../../../phonesrv_plat/dialpad_api/inc +} + +# +SOURCES += mt_keyhandler.cpp + +# +LIBS += -ldialpad diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/runall.cmd --- a/telutils/dialpad/tsrc/unit/runall.cmd Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/tsrc/unit/runall.cmd Fri Apr 16 15:31:58 2010 +0300 @@ -20,6 +20,9 @@ call runtest.cmd ut_dialpadbuttonstyle call runtest.cmd ut_dialpadmultitaphandler call runtest.cmd mt_dialpad +call runtest.cmd ut_dialpadvoicemailboxeventfilter +call runtest.cmd mt_keyhandler +call runtest.cmd ut_dialpadbluetootheventfilter ) @echo off diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/unit.pro --- a/telutils/dialpad/tsrc/unit/unit.pro Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/tsrc/unit/unit.pro Fri Apr 16 15:31:58 2010 +0300 @@ -18,4 +18,7 @@ TEMPLATE = subdirs SUBDIRS += ut_dialpadbuttonstyle SUBDIRS += ut_dialpadmultitaphandler +SUBDIRS += ut_dialpadvoicemailboxeventfilter +SUBDIRS += ut_dialpadbluetootheventfilter SUBDIRS += mt_dialpad +SUBDIRS += mt_keyhandler diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,250 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#ifdef Q_OS_SYMBIAN +#include "xqservicerequest.h" +#endif + +#include "dialpadtest.h" +#include "dialpadbluetootheventfilter.h" +#include "dialpad.h" + +const int WAIT_TIME = 300; +QString mService; +QString mMessage; +bool mXQServiceConstructed; +bool mSendCalled; + +#ifdef Q_OS_SYMBIAN +XQServiceRequest::XQServiceRequest(const QString& service, const QString& message, const bool& synchronous) { mService=service; mMessage=message; mXQServiceConstructed=true; } +XQServiceRequest::~XQServiceRequest() {} +bool XQServiceRequest::send(QVariant& retValue) { mSendCalled=true; return true; } +void XQServiceRequest::addArg(const QVariant& v) {} +#endif + +// helper class +class KeyEventCatcher : public QObject +{ +public: + bool eventFilter(QObject* watched, QEvent * event) + { + Q_UNUSED(watched); + + if (event->type() == QEvent::KeyPress) { + QKeyEvent *keyEvent = static_cast(event); + mKeyPresses.append(keyEvent->key()); + return false; + } else if (event->type() == QEvent::KeyRelease) { + QKeyEvent *keyEvent = static_cast(event); + mKeyReleases.append(keyEvent->key()); + return false; + } + return false; + } + +public: + QList mKeyPresses; + QList mKeyReleases; +}; + +// test cases +class ut_DialpadBluetoothEventFilter : public QObject +{ + Q_OBJECT + +public: + enum MouseEventType + { + Press, + Release, + Click + }; + +private slots: + void initTestCase(); + void init(); + void cleanup(); + void cleanupTestCase(); + void testLongPressAsteriskKey(); + 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; +}; + +void ut_DialpadBluetoothEventFilter::initTestCase() +{ + mMainWindow = new HbMainWindow; + + mKeyCatcher = new KeyEventCatcher; + mMainWindow->installEventFilter(mKeyCatcher); + + mDialpad = new Dialpad(); + mEventFilter = new DialpadBluetoothEventFilter(mDialpad, this); + hbInstance->allMainWindows().at(0)->installEventFilter(mEventFilter); + + QRectF rect(mMainWindow->contentsRect()); + rect.setHeight(rect.height()*0.7); + rect.moveTop((mMainWindow->contentsRect().height()-rect.height())/2); + + mDialpad->setPreferredSize(360,400); + mDialpad->setPos(0,100); + + 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(); +} + +void ut_DialpadBluetoothEventFilter::init() +{ + mService = QString(""); + mMessage = QString(""); + mXQServiceConstructed = false; + mSendCalled = false; +} + +void ut_DialpadBluetoothEventFilter::cleanupTestCase() +{ + delete mDialpad; + delete mMainWindow; + delete mKeyCatcher; +} + +void ut_DialpadBluetoothEventFilter::cleanup() +{ + mKeyCatcher->mKeyPresses.clear(); + mKeyCatcher->mKeyReleases.clear(); + mDialpad->editor().setText(QString()); + 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); + QTest::qWait(2000); + mouseClickDialpad(Qt::Key_Asterisk, Release); + QTest::qWait(1000); + QCOMPARE(mDialpad->editor().text(), QString("")); + mDialpad->closeDialpad(); + + QVERIFY(mXQServiceConstructed == true); + QCOMPARE(mService, QString("com.nokia.services.btservices.ToggleBluetooth")); + QCOMPARE(mMessage, QString("toggleBluetooth()")); + QVERIFY(mSendCalled == true); +} + +void ut_DialpadBluetoothEventFilter::testShortAndLongPressAsteriskKey() +{ + 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); + QTest::qWait(2000); + mouseClickDialpad(Qt::Key_Asterisk, Release); + QCOMPARE(mDialpad->editor().text(), QString("**")); + mDialpad->closeDialpad(); +} + +DIALPAD_TEST_MAIN(ut_DialpadBluetoothEventFilter) +#include "ut_dialpadbluetootheventfilter.moc" + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,38 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +# + +TEMPLATE = app +TARGET = +INCLUDEPATH += . ../../../inc ../shared + +CONFIG += hb qtestlib + +symbian { + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +} else:win32 { + DESTDIR = ./ + INCLUDEPATH += ../../../../../phonesrv_plat/dialpad_api/inc +} + +# +HEADERS += ../../../inc/dialpadbluetootheventfilter.h +HEADERS += xqservicerequest.h +SOURCES += ut_dialpadbluetootheventfilter.cpp +SOURCES += ../../../src/dialpadbluetootheventfilter.cpp + +# +LIBS += -ldialpad diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqservicerequest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqservicerequest.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +class XQServiceRequest : public QObject +{ +public: + XQServiceRequest(const QString& service, const QString& message, const bool& synchronous); + ~XQServiceRequest(); + bool send(QVariant& retValue); + void addArg(const QVariant& v); + template + inline XQServiceRequest &operator<< (const T &var) + { + QVariant v = qVariantFromValue(var); + addArg(v); + return *this; + } +}; diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/ut_dialpadbuttonstyle/ut_dialpadbuttonstyle.cpp --- a/telutils/dialpad/tsrc/unit/ut_dialpadbuttonstyle/ut_dialpadbuttonstyle.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadbuttonstyle/ut_dialpadbuttonstyle.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -69,15 +69,15 @@ mStyle->setButtonStyle(DialpadButtonStyle::NormalButtonStyle); mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option); - QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_button_keypad_pressed"); + QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_input_btn_keypad_pressed"); mStyle->setButtonStyle(DialpadButtonStyle::FunctionButtonStyle); mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option); - QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_button_function_pressed"); + QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_input_btn_function_pressed"); mStyle->setButtonStyle(DialpadButtonStyle::CallButtonStyle); mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option); - QVERIFY(item->frameDrawer().frameGraphicsName()==":/qtg_fr_btn_green_pressed"); + QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_btn_green_pressed"); // Enabled OFF option.state &= ~QStyle::State_On; @@ -85,15 +85,15 @@ mStyle->setButtonStyle(DialpadButtonStyle::NormalButtonStyle); mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option); - QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_button_keypad_normal"); + QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_input_btn_keypad_normal"); mStyle->setButtonStyle(DialpadButtonStyle::FunctionButtonStyle); mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option); - QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_button_function_normal"); + QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_input_btn_function_normal"); mStyle->setButtonStyle(DialpadButtonStyle::CallButtonStyle); mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option); - QVERIFY(item->frameDrawer().frameGraphicsName()==":/qtg_fr_btn_green_normal"); + QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_btn_green_normal"); // Disabled option.state &= ~QStyle::State_Enabled; @@ -119,7 +119,7 @@ HbStyleOptionPushButton option; option.backgroundFrameDrawer = 0; QColor color; - color = HbColorScheme::color("input_button_normal"); + color = HbColorScheme::color("qtc_input_button_normal"); // Enabled ON option.state |= QStyle::State_On; @@ -136,7 +136,7 @@ HbStyleOptionPushButton option; option.backgroundFrameDrawer = 0; QColor color; - color = HbColorScheme::color("input_button_normal"); + color = HbColorScheme::color("qtc_input_button_normal"); // Enabled ON option.state |= QStyle::State_On; @@ -151,10 +151,10 @@ { HbIconItem* item = new HbIconItem(); HbStyleOptionPushButton option; - QColor funcColor(HbColorScheme::color("input_function_normal")); - QColor normColor(HbColorScheme::color("input_button_normal")); - QColor answerNormal(HbColorScheme::color("answer_normal")); - QColor answerPressed(HbColorScheme::color("answer_pressed")); + QColor funcColor(HbColorScheme::color("qtc_input_function_normal")); + QColor normColor(HbColorScheme::color("qtc_input_button_normal")); + QColor answerNormal(HbColorScheme::color("qtc_callhandling_answer_normal")); + QColor answerPressed(HbColorScheme::color("qtc_callhandling_answer_pressed")); // Normal option.state |= QStyle::State_Enabled; diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,276 @@ +/*! +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#ifdef Q_OS_SYMBIAN +#include "xqservicerequest.h" +#endif + +#include "dialpadtest.h" +#include "dialpadvoicemailboxeventfilter.h" +#include "dialpad.h" +#include "dialpadsymbianwrapper.h" + +const int WAIT_TIME = 300; +QString mService; +QString mMessage; +bool mXQServiceConstructed; +bool mSendCalled; + +DialpadSymbianWrapper::DialpadSymbianWrapper(QObject *parent) : d_ptr(NULL) {} +DialpadSymbianWrapper::~DialpadSymbianWrapper() {} +int DialpadSymbianWrapper::getMailboxNumber(QString &vmbxNumber) { vmbxNumber=QString("12345678"); return 0; } +int DialpadSymbianWrapper::defineMailboxNumber(QString &vmbxNumber) { return 0; } + +#ifdef Q_OS_SYMBIAN +XQServiceRequest::XQServiceRequest(const QString& service, const QString& message, const bool& synchronous) { mService=service; mMessage=message; mXQServiceConstructed=true; } +XQServiceRequest::~XQServiceRequest() {} +bool XQServiceRequest::send(QVariant& retValue) { mSendCalled=true; return true; } +void XQServiceRequest::addArg(const QVariant& v) {} +#endif + +// helper class +class KeyEventCatcher : public QObject +{ +public: + bool eventFilter(QObject* watched, QEvent * event) + { + Q_UNUSED(watched); + + if (event->type() == QEvent::KeyPress) { + QKeyEvent *keyEvent = static_cast(event); + mKeyPresses.append(keyEvent->key()); + return false; + } else if (event->type() == QEvent::KeyRelease) { + QKeyEvent *keyEvent = static_cast(event); + mKeyReleases.append(keyEvent->key()); + return false; + } + return false; + } + +public: + QList mKeyPresses; + QList mKeyReleases; +}; + +// test cases +class ut_DialpadVoiceMailboxEventFilter : public QObject +{ + Q_OBJECT + +public: + enum MouseEventType + { + Press, + Release, + Click + }; + +private slots: + void initTestCase(); + void init(); + void cleanupTestCase(); + void cleanup(); + + // These are actual voice mailbox event filter unit tests + void testNumericKeyOneLongPress(); + void testNumericKeyOneShortPress(); + 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; +}; + +void ut_DialpadVoiceMailboxEventFilter::initTestCase() +{ + mMainWindow = new HbMainWindow; + + mKeyCatcher = new KeyEventCatcher; + mMainWindow->installEventFilter(mKeyCatcher); + + mDialpad = new Dialpad(); + mEventFilter = new DialpadVoiceMailboxEventFilter(mDialpad, this); + hbInstance->allMainWindows().at(0)->installEventFilter(mEventFilter); + + QRectF rect(mMainWindow->contentsRect()); + rect.setHeight(rect.height()*0.7); + rect.moveTop((mMainWindow->contentsRect().height()-rect.height())/2); + + mDialpad->setPreferredSize(360,400); + mDialpad->setPos(0,100); + + 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(); +} + +void ut_DialpadVoiceMailboxEventFilter::init() +{ + mService = QString(""); + mMessage = QString(""); + mXQServiceConstructed = false; + mSendCalled = false; +} + +void ut_DialpadVoiceMailboxEventFilter::cleanupTestCase() +{ + delete mDialpad; + delete mMainWindow; + delete mKeyCatcher; +} + +void ut_DialpadVoiceMailboxEventFilter::cleanup() +{ + mKeyCatcher->mKeyPresses.clear(); + mKeyCatcher->mKeyReleases.clear(); + mDialpad->editor().setText(QString()); + 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); + QTest::qWait(2000); + mouseClickDialpad(Qt::Key_1, Release); + QTest::qWait(1000); + QCOMPARE(mDialpad->editor().text(), QString("")); + mDialpad->closeDialpad(); + +#ifdef Q_OS_SYMBIAN + QVERIFY(mXQServiceConstructed == true); + QVERIFY(mSendCalled == true); + QCOMPARE(mService, QString("com.nokia.services.telephony")); + QCOMPARE(mMessage, QString("dial(QString)")); +#endif +} + +void ut_DialpadVoiceMailboxEventFilter::testNumericKeyOneShortPress() +{ + mDialpad->openDialpad(); + QTest::qWait(WAIT_TIME); + mouseClickDialpad(Qt::Key_1, Press); + mouseClickDialpad(Qt::Key_1, Release); + // Check that character '1' is in editor. + QCOMPARE(mDialpad->editor().text(), QString("1")); +} + +void ut_DialpadVoiceMailboxEventFilter::testNumericKeyOneShortThenLongPress() +{ + // 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); + QTest::qWait(2000); + mouseClickDialpad(Qt::Key_1, Release); + QTest::qWait(1000); + QVERIFY(mDialpad->editor().text()=="11"); + mDialpad->closeDialpad(); +} + +DIALPAD_TEST_MAIN(ut_DialpadVoiceMailboxEventFilter) +#include "ut_dialpadvoicemailboxeventfilter.moc" + diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.pro Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +# + +TEMPLATE = app +TARGET = +INCLUDEPATH += . ../../../inc ../shared + +CONFIG += hb qtestlib + +symbian { + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +} else:win32 { + DESTDIR = ./ + INCLUDEPATH += ../../../../../phonesrv_plat/dialpad_api/inc + INCLUDEPATH += ../../../../xqtelephonyservice/inc +} + +# +HEADERS += ../../../inc/dialpadvoicemailboxeventfilter.h +HEADERS += ../../../inc/dialpadsymbianwrapper.h +HEADERS += xqservicerequest.h +SOURCES += ut_dialpadvoicemailboxeventfilter.cpp +SOURCES += ../../../src/dialpadvoicemailboxeventfilter.cpp + +# +LIBS += -ldialpad diff -r ae8abd0db65c -r e32024264ebb telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/xqservicerequest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/xqservicerequest.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +class XQServiceRequest : public QObject +{ +public: + XQServiceRequest(const QString& service, const QString& message, const bool& synchronous); + ~XQServiceRequest(); + bool send(QVariant& retValue); + void addArg(const QVariant& v); + template + inline XQServiceRequest &operator<< (const T &var) + { + QVariant v = qVariantFromValue(var); + addArg(v); + return *this; + } +}; diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/group/bld.inf --- a/telutils/phoneparser/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/group/bld.inf Fri Apr 16 15:31:58 2010 +0300 @@ -23,11 +23,11 @@ PRJ_EXPORTS -../group/phoneparser_stub.SIS\ +../group/phoneparser_stub.sis\ /epoc32/data/z/system/install/phoneparser_stub.sis // IBY file exports -../rom/Phoneparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH(Phoneparser.iby) +../rom/phoneparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phoneparser.iby) PRJ_MMPFILES ../group/phoneparser.mmp diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/group/phoneparser.mmp --- a/telutils/phoneparser/group/phoneparser.mmp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/group/phoneparser.mmp Fri Apr 16 15:31:58 2010 +0300 @@ -25,33 +25,33 @@ CAPABILITY CAP_GENERAL_DLL SOURCEPATH ../src -SOURCE PhoneGsmParser.cpp -SOURCE CPhoneGsmParser.cpp -SOURCE CPhoneGsmParserBase.cpp -SOURCE CPhoneGsmParserResult.cpp -SOURCE CPhoneGsmSsParser.cpp -SOURCE CPhoneGsmSsHandler.cpp -SOURCE CPhoneGsmSimControlParser.cpp -SOURCE CPhoneGsmSimControlHandler.cpp -SOURCE CPhoneGsmPhoneNumberParser.cpp -SOURCE CPhoneGsmPhoneNumberHandler.cpp -SOURCE CPhoneGsmOptionContainer.cpp -SOURCE CPhoneGsmHandlerContainer.cpp -SOURCE CPhoneGsmDummyParser.cpp -SOURCE CPhoneGsmMiscHandler.cpp -SOURCE CPhoneGsmParserContainer.cpp -SOURCE CPhoneGsmSsCallParser.cpp -SOURCE CPhoneGsmSsCallHandler.cpp -SOURCE CPhoneGsmManufacturerParser.cpp -SOURCE CPhoneGsmManufacturerHandler.cpp -SOURCE CPhoneGsmPcnProcedureParser.cpp -SOURCE CPhoneGsmPcnProcedureHandler.cpp -SOURCE CPhoneGsmEmergencyNumberParser.cpp -SOURCE CPhoneGsmEmergencyNumberHandler.cpp -SOURCE CPhoneParserFeatures.cpp -SOURCE CPhoneVoipNumberParser.cpp -SOURCE CPhoneVoipNumberHandler.cpp -SOURCE CPhoneGsmImeiParser.cpp +SOURCE phonegsmparser.cpp +SOURCE cphonegsmparser.cpp +SOURCE cphonegsmparserbase.cpp +SOURCE cphonegsmparserresult.cpp +SOURCE cphonegsmssparser.cpp +SOURCE cphonegsmsshandler.cpp +SOURCE cphonegsmsimcontrolparser.cpp +SOURCE cphonegsmsimcontrolhandler.cpp +SOURCE cphonegsmphonenumberparser.cpp +SOURCE cphonegsmphonenumberhandler.cpp +SOURCE cphonegsmoptioncontainer.cpp +SOURCE cphonegsmhandlercontainer.cpp +SOURCE cphonegsmdummyparser.cpp +SOURCE cphonegsmmischandler.cpp +SOURCE cphonegsmparsercontainer.cpp +SOURCE cphonegsmsscallparser.cpp +SOURCE cphonegsmsscallhandler.cpp +SOURCE cphonegsmmanufacturerparser.cpp +SOURCE cphonegsmmanufacturerhandler.cpp +SOURCE cphonegsmpcnprocedureparser.cpp +SOURCE cphonegsmpcnprocedurehandler.cpp +SOURCE cphonegsmemergencynumberparser.cpp +SOURCE cphonegsmemergencynumberhandler.cpp +SOURCE cphoneparserfeatures.cpp +SOURCE cphonevoipnumberparser.cpp +SOURCE cphonevoipnumberhandler.cpp +SOURCE cphonegsmimeiparser.cpp USERINCLUDE ../inc diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/rom/Phoneparser.iby --- a/telutils/phoneparser/rom/Phoneparser.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/rom/Phoneparser.iby Fri Apr 16 15:31:58 2010 +0300 @@ -18,8 +18,8 @@ #ifndef __PhoneParser_IBY__ #define __PhoneParser_IBY__ -file=ABI_DIR\BUILD_DIR\PhoneParser.dll System\libs\PhoneParser.dll -data=ZSYSTEM\install\phoneparser_stub.SIS System\Install\phoneparser_stub.SIS +file=ABI_DIR\BUILD_DIR\phoneparser.dll System\libs\phoneparser.dll +data=ZSYSTEM\install\phoneparser_stub.sis System\Install\phoneparser_stub.sis #endif diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmDummyParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmDummyParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmDummyParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include "CPhoneGsmDummyParser.h" +#include "cphonegsmdummyparser.h" #include "cphonegsmparserresult.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmEmergencyNumberHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmEmergencyNumberHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmEmergencyNumberHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "cphonegsmemergencynumberhandler.h" -#include "CPhoneGsmEmergencyNumberParser.h" +#include "cphonegsmemergencynumberparser.h" #include "cphonegsmparserresult.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmEmergencyNumberParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmEmergencyNumberParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmEmergencyNumberParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,10 +17,10 @@ // INCLUDE FILES -#include "CPhoneGsmEmergencyNumberParser.h" +#include "cphonegsmemergencynumberparser.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" -#include "CPhoneParserFeatures.h" +#include "cphonegsmoptioncontainer.h" +#include "cphoneparserfeatures.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmImeiParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmImeiParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmImeiParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "CPhoneGsmImeiParser.h" +#include "cphonegsmimeiparser.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmoptioncontainer.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmManufacturerHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmManufacturerHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmManufacturerHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "cphonegsmmanufacturerhandler.h" -#include "CPhoneGsmManufacturerParser.h" +#include "cphonegsmmanufacturerparser.h" #include "cphonegsmparserresult.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmManufacturerParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmManufacturerParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmManufacturerParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,10 +17,10 @@ // INCLUDE FILES -#include "CPhoneGsmManufacturerParser.h" -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmmanufacturerparser.h" +#include "cphonegsmoptioncontainer.h" #include "cphonegsmparserresult.h" -#include "CPhoneParserFeatures.h" +#include "cphoneparserfeatures.h" // CONSTANTS const TInt KPhoneManufacturerCodeArrayGanularity = 5; diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmOptionContainer.cpp --- a/telutils/phoneparser/src/CPhoneGsmOptionContainer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmOptionContainer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmoptioncontainer.h" #include "phonegsmparser.h" -#include "CPhoneParserFeatures.h" +#include "cphoneparserfeatures.h" // CONSTANTS const TInt KPhoneGsmOptionGranularity = 5; diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,12 +20,12 @@ // INCLUDE FILES #include -#include "CPhoneGsmParser.h" +#include "cphonegsmparser.h" #include "cphonegsmparserresult.h" #include "cphonegsmparserbase.h" -#include "CPhoneGsmDummyParser.h" -#include "CPhoneGsmOptionContainer.h" -#include "CPhoneParserFeatures.h" +#include "cphonegsmdummyparser.h" +#include "cphonegsmoptioncontainer.h" +#include "cphoneparserfeatures.h" #include "cphonegsmoptioncontainerbase.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmParserContainer.cpp --- a/telutils/phoneparser/src/CPhoneGsmParserContainer.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmParserContainer.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,9 +19,9 @@ // INCLUDE FILES #include -#include "CPhoneGsmParserContainer.h" +#include "cphonegsmparsercontainer.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmoptioncontainer.h" #include "phonegsmparser.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmPcnProcedureHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmPcnProcedureHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmPcnProcedureHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "cphonegsmpcnprocedurehandler.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmPcnProcedureParser.h" +#include "cphonegsmpcnprocedureparser.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmPcnProcedureParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmPcnProcedureParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmPcnProcedureParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "CPhoneGsmPcnProcedureParser.h" +#include "cphonegsmpcnprocedureparser.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmoptioncontainer.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmPhoneNumberHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmPhoneNumberHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmPhoneNumberHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "cphonegsmphonenumberhandler.h" -#include "CPhoneGsmPhoneNumberParser.h" +#include "cphonegsmphonenumberparser.h" #include "cphonegsmparserresult.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmPhoneNumberParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmPhoneNumberParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmPhoneNumberParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,12 +17,12 @@ // INCLUDE FILES -#include "CPhoneGsmPhoneNumberParser.h" +#include "cphonegsmphonenumberparser.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" -#include "CPhoneVoipNumberParser.h" -#include "CPhoneParserFeatures.h" -#include "phoneParserCommon.h" +#include "cphonegsmoptioncontainer.h" +#include "cphonevoipnumberparser.h" +#include "cphoneparserfeatures.h" +#include "phoneparsercommon.h" // CONSTANTS _LIT( KPhoneClirSuppress, "*31#" ); _LIT( KPhoneClirInvoke, "#31#" ); diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmSimControlHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmSimControlHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmSimControlHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "cphonegsmsimcontrolhandler.h" -#include "CPhoneGsmSimControlParser.h" +#include "cphonegsmsimcontrolparser.h" #include "cphonegsmparserresult.h" #include "phonegsmparser.h" diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmSimControlParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmSimControlParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmSimControlParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "CPhoneGsmSimControlParser.h" +#include "cphonegsmsimcontrolparser.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmoptioncontainer.h" // CONSTANTS _LIT( KPhoneSimControlPinChangeCode, "04" ); diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmSsCallHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmSsCallHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmSsCallHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "cphonegsmsscallhandler.h" -#include "CPhoneGsmSsCallParser.h" +#include "cphonegsmsscallparser.h" #include "cphonegsmparserresult.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmSsCallParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmSsCallParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmSsCallParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "CPhoneGsmSsCallParser.h" +#include "cphonegsmsscallparser.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmoptioncontainer.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmSsHandler.cpp --- a/telutils/phoneparser/src/CPhoneGsmSsHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmSsHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -20,7 +20,7 @@ #include #include "cphonegsmsshandler.h" -#include "CPhoneGsmSsParser.h" +#include "cphonegsmssparser.h" #include "cphonegsmparserresult.h" // LOCAL FUNCTION PROTOTYPES diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneGsmSsParser.cpp --- a/telutils/phoneparser/src/CPhoneGsmSsParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneGsmSsParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,11 +21,11 @@ #include #include -#include "CPhoneGsmSsParser.h" +#include "cphonegsmssparser.h" #include "cphonegsmparserresult.h" #include "phonegsmparser.h" -#include "CPhoneGsmOptionContainer.h" -#include "CPhoneParserFeatures.h" +#include "cphonegsmoptioncontainer.h" +#include "cphoneparserfeatures.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneParserFeatures.cpp --- a/telutils/phoneparser/src/CPhoneParserFeatures.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneParserFeatures.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include "CPhoneParserFeatures.h" +#include "cphoneparserfeatures.h" #include #include #include diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneVoipNumberHandler.cpp --- a/telutils/phoneparser/src/CPhoneVoipNumberHandler.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneVoipNumberHandler.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "cphonevoipnumberhandler.h" -#include "CPhoneVoipNumberParser.h" +#include "cphonevoipnumberparser.h" #include "cphonegsmparserresult.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/CPhoneVoipNumberParser.cpp --- a/telutils/phoneparser/src/CPhoneVoipNumberParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/CPhoneVoipNumberParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -17,10 +17,10 @@ // INCLUDE FILES -#include "CPhoneVoipNumberParser.h" +#include "cphonevoipnumberparser.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" -#include "phoneParserCommon.h" +#include "cphonegsmoptioncontainer.h" +#include "phoneparsercommon.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/phoneparser/src/PhoneGsmParser.cpp --- a/telutils/phoneparser/src/PhoneGsmParser.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/phoneparser/src/PhoneGsmParser.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,23 +18,23 @@ // INCLUDE FILES #include "phonegsmparser.h" -#include "CPhoneGsmParser.h" +#include "cphonegsmparser.h" #include "cphonegsmparserbase.h" #include "cphonegsmparserresult.h" -#include "CPhoneGsmOptionContainer.h" +#include "cphonegsmoptioncontainer.h" -#include "CPhoneGsmParserContainer.h" -#include "CPhoneGsmSsParser.h" -#include "CPhoneGsmSimControlParser.h" -#include "CPhoneGsmPhoneNumberParser.h" -#include "CPhoneGsmSsCallParser.h" -#include "CPhoneGsmManufacturerParser.h" -#include "CPhoneGsmPcnProcedureParser.h" +#include "cphonegsmparsercontainer.h" +#include "cphonegsmssparser.h" +#include "cphonegsmsimcontrolparser.h" +#include "cphonegsmphonenumberparser.h" +#include "cphonegsmsscallparser.h" +#include "cphonegsmmanufacturerparser.h" +#include "cphonegsmpcnprocedureparser.h" #include "cphonegsmmanufacturerhandler.h" -#include "CPhoneGsmEmergencyNumberParser.h" -#include "CPhoneParserFeatures.h" -#include "CPhoneVoipNumberParser.h" -#include "CPhoneGsmImeiParser.h" +#include "cphonegsmemergencynumberparser.h" +#include "cphoneparserfeatures.h" +#include "cphonevoipnumberparser.h" +#include "cphonegsmimeiparser.h" // CONSTANTS diff -r ae8abd0db65c -r e32024264ebb telutils/telephonyservice/rom/telephonyservice.iby --- a/telutils/telephonyservice/rom/telephonyservice.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/telephonyservice/rom/telephonyservice.iby Fri Apr 16 15:31:58 2010 +0300 @@ -19,7 +19,7 @@ #define __TelephonyService_IBY__ file=ABI_DIR\BUILD_DIR\telephonyservice.dll System\libs\telephonyservice.dll -//data=ZSYSTEM\install\phoneparser_stub.SIS System\Install\phoneparser_stub.SIS +//data=ZSYSTEM\install\phoneparser_stub.sis System\Install\phoneparser_stub.sis #endif diff -r ae8abd0db65c -r e32024264ebb telutils/xqtelephonyservice/inc/qtphonesrvlog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/xqtelephonyservice/inc/qtphonesrvlog.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Provides macros for logging +* +*/ + + + +#ifndef __QTPHONESRVLOG_H__ +#define __QTPHONESRVLOG_H__ + +// INCLUDES +#include + +// Q_FUNC_INFO does not print function signature in Symbian.. + +#ifdef _DEBUG +#define PHONE_DEBUG(A) qDebug() < #include +#include "qtphonesrvlog.h" XQCallInfo *XQCallInfo::create() { - qDebug()<<"XQCallInfo::create()"; + PHONE_TRACE; return new XQCallInfoImpl(); } void XQCallInfo::sendCallInfoChangedSignal() { - qDebug()<<"XQCallInfo::sendCallInfoChangedSignal()"; + PHONE_TRACE; emit callInformationChanged (); } diff -r ae8abd0db65c -r e32024264ebb telutils/xqtelephonyservice/src/xqcallinfoimpl.cpp --- a/telutils/xqtelephonyservice/src/xqcallinfoimpl.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/xqtelephonyservice/src/xqcallinfoimpl.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,7 +16,6 @@ */ #include "xqcallinfoimpl.h" -#include #include #include #include diff -r ae8abd0db65c -r e32024264ebb telutils/xqtelephonyservice/xqtelephonyservice.pro --- a/telutils/xqtelephonyservice/xqtelephonyservice.pro Fri Mar 19 09:40:14 2010 +0200 +++ b/telutils/xqtelephonyservice/xqtelephonyservice.pro Fri Apr 16 15:31:58 2010 +0300 @@ -43,6 +43,11 @@ BLD_INF_RULES.prj_exports += \ "$${LITERAL_HASH}include " \ "./rom/xqtelephonyservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(xqtelephonyservice.iby)" + + # tracing macros + headers.sources = inc/qtphonesrvlog.h + headers.path = |../../inc + for(header, headers.sources):BLD_INF_RULES.prj_exports += "$$header $$headers.path/$$basename(header)" } # Input diff -r ae8abd0db65c -r e32024264ebb vmbx/group/bld.inf --- a/vmbx/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Build file for engines. -* -*/ - -#include "../vmbxengine/group/bld.inf" -// End of File diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/inc/loggerutil.h --- a/vmbx/vmbxcpplugin/inc/loggerutil.h Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/inc/loggerutil.h Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009 -2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -19,9 +19,9 @@ #define __LOGGERUTIL_H // INCLUDES -#include -#include -#include +#include +#include +#include /*************************** * LOGGER SETTINGS @@ -39,9 +39,9 @@ #else #ifdef __WINS__ - #define _LOGGERUTIL_LOGGING_METHOD 2 // UDEB BUILD, WINS + #define _LOGGERUTIL_LOGGING_METHOD 1 // UDEB BUILD, WINS #else - #define _LOGGERUTIL_LOGGING_METHOD 1 // UDEB BUILD, HW + #define _LOGGERUTIL_LOGGING_METHOD 2 // HW UDEB #endif // __WINS__ #endif // _DEBUG diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/inc/vmbxcpgroup.h --- a/vmbx/vmbxcpplugin/inc/vmbxcpgroup.h Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/inc/vmbxcpgroup.h Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -17,30 +17,22 @@ #ifndef VMBXCPGROUP_H #define VMBXCPGROUP_H +// System includes #include +// Forward declarations class VmbxUiEngine; class CpItemDataHelper; -/*! - * vmbx control panel plugin - * - * @lib vmbxcpplugin.lib - * @since S60 v5.2 - */ -// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// TODO: update VmbxCpGroup to class VmbxCpGroup : public CpSettingFormItemData -// when DataForm bug is fixed (QTControlPanel wk39-41?) -// API will change but it should be just a few minutes of work -// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +// Class declaration class VmbxCpGroup : public CpSettingFormItemData { Q_OBJECT public: /*! - * Constructor - */ + Constructor + */ VmbxCpGroup( HbDataFormModelItem::DataItemType type, const QString &label, @@ -49,112 +41,87 @@ CpItemDataHelper &itemDataHelper); /*! - * - */ + Constructor + */ explicit VmbxCpGroup( const QString &configFile = QString(), const HbDataFormModelItem *parent = 0); /*! - * Destructor - */ + Destructor + */ ~VmbxCpGroup(); private slots: /*! - * - */ + Notification slot for engine signal about + Voice Mailbox entries' changes + */ void voiceMailboxEngineEntriesUpdated(); private: -// TODO: comment everything - - /*! - * - */ - void updateCsVoicePrimaryToUi(); - - /*! - * - */ - void updateCsVoiceAlsToUi(); - - /*! - * - */ - void updateCsVideoPrimaryToUi(); - /* NOTICE: IT IS POSSIBLE THAT PS SERVICES WILL NOT BE DISPLAYED BY VMBX CONTROL PANEL - WHEN WE GET THE NEW UI CONCEPT!!!!!! In that case this is not needed - */ - - /*! - * - */ - void updatePsServicesToUi(); - - /*! - * - */ - void updateAllMailboxesToUi(); - - /*! - * - */ - void updateDefaultMailboxToUi(); - -private: - -// From CpCategoryObject - - /*! - * - */ - //loadConfigPlugins(); - - /*! - * - */ - void beforeLoadingConfigPlugins( CpItemDataHelper &itemDataHelper ); - - /*! - * - */ - //void afterLoadingConfigPlugins(); - -private: /*! - * - * Own. - */ - VmbxUiEngine* mUiEngine; + Update Cs voice primary + */ + void updateCsVoicePrimaryToUi(); - // UI controls + /*! + Update Cs voice Als + */ + void updateCsVoiceAlsToUi(); /*! - * - * Not own. - */ - CpSettingFormItemData* mEditorCsVoice1; + update Cs video primary + */ + void updateCsVideoPrimaryToUi(); + + /*! + NOTICE: IT IS POSSIBLE THAT PS SERVICES WILL NOT BE DISPLAYED + BY VMBX CONTROL PANEL WHEN WE GET THE NEW UI CONCEPT!!!!!! + In that case this is not needed + */ + + /*! + update Ps services + */ + void updatePsServicesToUi(); /*! - * - * Not own. - */ - CpSettingFormItemData* mEditorCsVoice2; + Update default mailbox + */ + void updateDefaultMailboxToUi(); + + /*! + Update all mailboxes + */ + void updateAllMailboxesToUi(); + +private: /*! - * - * Not own. - */ - CpSettingFormItemData* mEditorCsVideo1; + Preparation before loading + */ + void loadingPreparation(CpItemDataHelper &itemDataHelper); + + +private: + + // Own. + VmbxUiEngine *mUiEngine; - /*! - * - * Contained pointers not own. - */ - QList mPsServiceEditors; + // Not own. + CpSettingFormItemData *mEditorCsVoice1; + + // Not own. + CpSettingFormItemData *mEditorCsVoice2; + + // Not own. + CpSettingFormItemData *mEditorCsVideo1; + + // Contained pointers not own. + QList mPsServiceEditors; }; #endif // VMBXCPGROUP_H diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/inc/vmbxcpplugin.h --- a/vmbx/vmbxcpplugin/inc/vmbxcpplugin.h Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/inc/vmbxcpplugin.h Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -17,32 +17,33 @@ #ifndef VMBXCPPLUGIN_H #define VMBXCPPLUGIN_H +// System includes #include -#include +#include + +// Forward declarations class CpItemDataHelper; -class VmbxCpPlugin : public QObject, public CpPluginPlatInterface +// Class declaration +class VmbxCpPlugin : public QObject, public CpPluginInterface { -Q_OBJECT - Q_INTERFACES(CpPluginPlatInterface) + Q_OBJECT + Q_INTERFACES(CpPluginInterface) public: /*! - * constructor - */ + Constructor + */ VmbxCpPlugin(); /*! - * destructor - */ + Destructor + */ ~VmbxCpPlugin(); - /*! - * from the Basic class CpPluginPlatInterface - * see class CpPluginPlatInterface - */ - int uid() const; /*! - * - */ - CpSettingFormItemData *createSettingFormItemData( CpItemDataHelper &itemDataHelper ) const; + From base class CpPluginInterface + Form more information please check the base class. + */ + virtual QList createSettingFormItemData( + CpItemDataHelper &itemDataHelper) const; }; #endif // VMBXCPPLUGIN_H diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/inc/vmbxuiengine.h --- a/vmbx/vmbxcpplugin/inc/vmbxuiengine.h Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/inc/vmbxuiengine.h Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -17,125 +17,102 @@ #ifndef VMBXUIENGINE_H #define VMBXUIENGINE_H -#include +// System includes +#include #include +// Forward declarations class CVoiceMailbox; -/*! - * VmbxUiEngine +class TVoiceMailboxParams; - * @lib vmbxcpplugin.lib - * @since S60 v5.2 - */ +// Class declaration class VmbxUiEngine : public QObject, public MVoiceMailboxObserver { Q_OBJECT - -public: - /*! Default Voice Mailbox setting values.*/ - enum TUiDefaultVoiceMailboxType - { - /*! - * None vmbx type. - */ - EUiDefaultVmbxNone = 0, - /*! - * Voice type. - */ - EUiDefaultVmbxVoice, - /*! - * Video type. - */ - EUiDefaultVmbxVideo, - /*! - * Voip type. - */ - EUiDefaultVmbxPsService - }; public: /*! - * Constructor. - */ + Constructor. + */ VmbxUiEngine(); /*! - * Destructor - */ + Destructor + */ ~VmbxUiEngine(); public: /*! - * Getter method for Voice number of Voice Mailbox. - * - * @since S60 v5.2 - * @param aValue Retrieved number. - */ - void GetCsVoice1Number( QString& aValue ); + Getter method for primary voice number of Voice Mailbox. + @param aValue Retrieved number. + */ + void getCsVoice1Number(QString &aValue); /*! - * Getter method for Voice ALS number of Voice Mailbox. - * - * @since S60 v5.2 - * @param aValue Retrieved number. - */ - void GetCsVoice2Number( QString& aValue ); + Getter method for voice ALS number of Voice Mailbox. + @param aValue Retrieved number. + */ + void getCsVoice2Number(QString &aValue); /*! - * Getter method for Video number of Voice Mailbox. - * - * @since S60 v5.2 - * @param aValue Retrieved number. - */ - void GetCsVideo1Number( QString& aValue ); + Getter method for primary video number of Voice Mailbox. + @param aValue Retrieved number. + */ + void getCsVideo1Number(QString &aValue); + // Add new Getter methods for other voice mailbox types + + // From MVoiceMailboxObserver /*! - * Getter method for default mailbox setting of Voice Mailbox. - * - * @since S60 v5.2 - */ - VmbxUiEngine::TUiDefaultVoiceMailboxType DefaultMailboxType(); - + From MVoiceMailboxObserver + Observer callback for number/address change notification + from voice mailbox engine. + The UI should be notified to update the number. + @param aVmbxEntry New voicemailbox entry. + */ + void HandleNotifyL(const CVoiceMailboxEntry &aVmbxEntry); + signals: /*! - * Signal emitted when voice mailbox data has been updated. - * - * @since S60 v5.2 - */ + Signal emitted when voice mailbox data has been updated. + */ void voiceMailboxEngineEntriesUpdated(); public slots: /*! - * Slot for signal when number has been edited on UI. - * - * @since S60 v5.2 - * @param aValue New value. - */ - void uiCsVoice1Changed( const QString& aValue ); + Slot for signal when number has been edited on UI. + @param aValue New value. + */ + void uiCsVoice1Changed( const QString &aValue ); -private: -// from MVoiceMailboxObserver +private: // New Method + /*! - * From MVoiceMailboxObserver - * Observer callback for number/address change notification - * from voice mailbox engine. - * The UI should be notified to update the number. - * - * @since S60 v5.2 - * @param aVmbxEntry New voicemailbox entry. - */ - void HandleNotifyL( const CVoiceMailboxEntry& aVmbxEntry ); + Getter method for voice mailbox number. + @param aParam Identify voice mailbox type + @param aValue Retrieved number. + */ + void getNumber(const TVoiceMailboxParams &aParam, + QString &aValue); + + /*! + Setter method for voice mailbox number. + @param aParam Identify voice mailbox type + @param aValue Retrieved number. + */ + void setNumber(const TVoiceMailboxParams &aParam, + const QString &aValue); private: /*! - * Symbian voice mailbox engine which offers basic entry retrieval, - * saving, querying etc. services. - * Own. - */ - CVoiceMailbox* mVmbxEngine; + Symbian voice mailbox engine which offers basic entry retrieval, + saving, querying etc. services. + Own. + */ + CVoiceMailbox *mVmbxEngine; }; #endif // VMBXUIENGINE_H diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/rom/vmbxcpplugin.iby --- a/vmbx/vmbxcpplugin/rom/vmbxcpplugin.iby Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/rom/vmbxcpplugin.iby Fri Apr 16 15:31:58 2010 +0300 @@ -1,6 +1,6 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/src/vmbxcpgroup.cpp --- a/vmbx/vmbxcpplugin/src/vmbxcpgroup.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/src/vmbxcpgroup.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -14,83 +14,94 @@ * Description: * */ - -#include // TODO: remember to replace this during API switch + +// System includes #include + +// User includes #include "vmbxuiengine.h" #include "vmbxcpgroup.h" #include "loggerutil.h" -// TODO: To get signals from ui control in QtControlPanelwk38 package you have -// to fix the mistyped connect -// in qtcontrolpanel\qtcontrolpanel\cpframework\src\cpsettingformitemdata.cpp: -// "lineEditTextChanged" is mistyped as "lineEditTextChangge" - -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + Constructor +*/ VmbxCpGroup::VmbxCpGroup( - const QString &/*configFile*/, + const QString &configFile, const HbDataFormModelItem *parent) : - CpSettingFormItemData( parent ), - mEditorCsVoice1( 0 ) // TODO: null member pointers as it is good practice + CpSettingFormItemData(parent), + mUiEngine(0), + mEditorCsVoice1(0), + mEditorCsVoice2(0), + mEditorCsVideo1(0) { + Q_UNUSED(configFile); } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + Constructor +*/ VmbxCpGroup::VmbxCpGroup( HbDataFormModelItem::DataItemType type, const QString &label, - const QString &/*configFile*/, + const QString &configFile, const HbDataFormModelItem *parent, - CpItemDataHelper &itemDataHelper ) : - CpSettingFormItemData( type, label, parent ), - mEditorCsVoice1( 0 ),// TODO: null member pointers as it is good practice - mEditorCsVoice2( 0 ), - mEditorCsVideo1( 0 ) + CpItemDataHelper &itemDataHelper) : + CpSettingFormItemData(type, label, parent), + mUiEngine(0), + mEditorCsVoice1(0), + mEditorCsVoice2(0), + mEditorCsVideo1(0) { _DBGLOG2("VmbxCpGroup::VmbxCpGroup label=",label) + Q_UNUSED(configFile); mUiEngine = new VmbxUiEngine(); - beforeLoadingConfigPlugins( itemDataHelper ); + loadingPreparation(itemDataHelper); _DBGLOG("VmbxCpGroup::VmbxCpGroup <") } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// -// Todo: rename this method -void VmbxCpGroup::beforeLoadingConfigPlugins( CpItemDataHelper &itemDataHelper ) +/*! + Destructor +*/ +VmbxCpGroup::~VmbxCpGroup() +{ + _DBGLOG("VmbxCpGroup::~VmbxCpGroup") + if (mUiEngine) { + delete mUiEngine; + mUiEngine = NULL; + } +} + +/*! + Preparation before loading +*/ +void VmbxCpGroup::loadingPreparation(CpItemDataHelper &itemDataHelper) { - _DBGLOG("VmbxCpGroup::beforeLoadingConfigPlugins >") - - // HbSettingFormDataItem::appendChild takes ownership + _DBGLOG("VmbxCpGroup::loadingPreparation >") QString newUiValue(""); mEditorCsVoice1 = new CpSettingFormItemData( HbDataFormModelItem::TextItem, tr("Call mailbox") ); - _DBGLOG("VmbxCpGroup::beforeLoadingConfigPlugins appendChild") + _DBGLOG("VmbxCpGroup::loadingPreparation appendChild") itemDataHelper.addConnection( mEditorCsVoice1, SIGNAL(textChanged(QString)), - mUiEngine, SLOT(uiCsVoice1Changed(QString) ) + mUiEngine, SLOT(uiCsVoice1Changed(QString)) ); - appendChild( mEditorCsVoice1 ); + // appendChild takes ownership + appendChild(mEditorCsVoice1); // Todo: add csVoice2 if ALS supported // Todo: add video only if supported //mEditorCsVideo1 = new CpSettingFormItemData( // HbDataFormModelItem::TextItem, tr("Video mailbox") ); - //_DBGLOG("VmbxCpGroup::beforeLoadingConfigPlugins appendChild") + //_DBGLOG("VmbxCpGroup::loadingPreparation appendChild") //appendChild( mEditorCsVideo1 ); - // TODO: get all ps addresses AND THEIR NAMES from engine and add ui controls for them + // TODO: get all ps addresses AND THEIR NAMES from engine and add ui controls + //for them // Set UI control pointers to mPsServiceEditors updateAllMailboxesToUi(); @@ -110,118 +121,102 @@ // Editing of PS Services is not allowed by default, disable ui editing // for them. - _DBGLOG("VmbxCpGroup::beforeLoadingConfigPlugins <") + _DBGLOG("VmbxCpGroup::loadingPreparation <") } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// -VmbxCpGroup::~VmbxCpGroup() -{ - _DBGLOG("VmbxCpGroup::~VmbxCpGroup") - if ( mUiEngine ) { - delete mUiEngine; - } - // TODO: check cleanup, this is draft project version -} - -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + Update Cs voice primary +*/ void VmbxCpGroup::updateCsVoicePrimaryToUi() { _DBGLOG("VmbxCpGroup::updateCsVoicePrimaryToUi") - if ( mEditorCsVoice1 &&mUiEngine) { + if (mEditorCsVoice1 && mUiEngine) { QString newUiValue(""); - mUiEngine->GetCsVoice1Number( newUiValue ); - mEditorCsVoice1->setContentWidgetData( "text", newUiValue ); + mUiEngine->getCsVoice1Number(newUiValue); + mEditorCsVoice1->setContentWidgetData("text", newUiValue); } } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + Update Cs voice Als +*/ void VmbxCpGroup::updateCsVoiceAlsToUi() { _DBGLOG("VmbxCpGroup::updateCsVoiceAlsToUi") - if ( mEditorCsVoice2 && mUiEngine ) - { + if (mEditorCsVoice2 && mUiEngine){ QString newUiValue(""); - mUiEngine->GetCsVoice1Number( newUiValue ); - _DBGLOG2( "VmbxCpGroup::updateCsVoiceAlsToUi newUiValue=", newUiValue) - mEditorCsVoice2->setContentWidgetData( "text", newUiValue ); - } + mUiEngine->getCsVoice1Number(newUiValue ); + _DBGLOG2("VmbxCpGroup::updateCsVoiceAlsToUi newUiValue=", newUiValue) + mEditorCsVoice2->setContentWidgetData("text", newUiValue ); + } } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + update Cs video primary +*/ void VmbxCpGroup::updateCsVideoPrimaryToUi() { - _DBGLOG("VmbxCpGroup::updateCsVoiceAlsToUi") - if ( mEditorCsVideo1 && mUiEngine ) - { + _DBGLOG("VmbxCpGroup::updateCsVideoPrimaryToUi >") + if (mEditorCsVideo1 && mUiEngine){ QString newUiValue(""); - mUiEngine->GetCsVideo1Number( newUiValue ); - _DBGLOG2( "VmbxCpGroup::updateCsVideoPrimaryToUi newUiValue=", newUiValue) - mEditorCsVideo1->setContentWidgetData( "text", newUiValue ); - } + mUiEngine->getCsVideo1Number(newUiValue); + _DBGLOG2("VmbxCpGroup::updateCsVideoPrimaryToUi newUiValue=", \ + newUiValue) + mEditorCsVideo1->setContentWidgetData("text", newUiValue); + } + _DBGLOG("VmbxCpGroup::updateCsVideoPrimaryToUi <") } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + update Ps services +*/ void VmbxCpGroup::updatePsServicesToUi() { - _DBGLOG("VmbxCpGroup::updatePsServicesToUi EMPTY METHOD WAITING FOR IMPLEMENTING") - /* - TODO: Set values from engine to ui - NOTICE: IT IS POSSIBLE THAT PS SERVICES WILL NOT BE DISPLAYED BY VMBX - CONTROL PANEL WHEN WE GET THE NEW UI CONCEPT!!!!!! - */ + _DBGLOG("VmbxCpGroup::updatePsServicesToUi >") + // Set values from engine to ui + // NOTICE: IT IS POSSIBLE THAT PS SERVICES WILL NOT BE DISPLAYED BY VMBX + // CONTROL PANEL WHEN WE GET THE NEW UI CONCEPT!!!!!! + _DBGLOG("VmbxCpGroup::updatePsServicesToUi <") } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + Update default mailbox +*/ void VmbxCpGroup::updateDefaultMailboxToUi() { - _DBGLOG("VmbxCpGroup::updateDefaultMailboxToUi EMPTY METHOD WAITING FOR IMPLEMENTING") - // TODO: implement me! - // Consider should you check here if the number length of the default mailbox + _DBGLOG("VmbxCpGroup::updateDefaultMailboxToUi >") + // Consider should you check here if the number + // length of the default mailbox // and reset the default mailbox type selection to "none" if it is. - // If you do so, remember to save the new value to engine. + // If you do so, remember to save the new value to engine. + _DBGLOG("VmbxCpGroup::updateDefaultMailboxToUi <") } -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + Update all mailboxes +*/ void VmbxCpGroup::updateAllMailboxesToUi() { - _DBGLOG("VmbxCpGroup::updateAllMailboxesToUi") + _DBGLOG("VmbxCpGroup::updateAllMailboxesToUi >") updateCsVoicePrimaryToUi(); - updateCsVoiceAlsToUi(); + //updateCsVoiceAlsToUi(); //updateCsVideoPrimaryToUi(); - updatePsServicesToUi(); - updateDefaultMailboxToUi(); + //updatePsServicesToUi(); + //updateDefaultMailboxToUi(); + _DBGLOG("VmbxCpGroup::updateAllMailboxesToUi <") } -// ----------------------------------------------------------------------------- -// Notification slot for engine signal about Voice Mailbox entries' changes -// ----------------------------------------------------------------------------- -// +/*! + Notification slot for engine signal about + Voice Mailbox entries' changes +*/ void VmbxCpGroup::voiceMailboxEngineEntriesUpdated() { _DBGLOG("VmbxCpGroup::voiceMailboxEngineEntriesUpdated") - /* TODO: consider is there need to pass the actual modified data - and mailbox type enum to slot (here) so only needed data can be updated. - */ + // Consider is there need to pass the actual modified data + // and mailbox type enum to slot (here) so only needed + // data can be updated. updateAllMailboxesToUi(); } + +//End of file \ No newline at end of file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/src/vmbxcpplugin.cpp --- a/vmbx/vmbxcpplugin/src/vmbxcpplugin.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/src/vmbxcpplugin.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -14,55 +14,52 @@ * Description: * */ - -#include + +// System includes +#include #include + +// User includes #include "vmbxcpplugin.h" #include "vmbxcpgroup.h" #include "loggerutil.h" -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// +/*! + Constructor +*/ VmbxCpPlugin::VmbxCpPlugin() { + _DBGLOG( "VmbxCpPlugin::VmbxCpPlugin()" ) } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// +/*! + Destructor +*/ VmbxCpPlugin::~VmbxCpPlugin() { +_DBGLOG( "VmbxCpPlugin::~VmbxCpPlugin()" ) } -// ----------------------------------------------------------------------------- -// Method returns the plugin uid for control panel framework. -// ----------------------------------------------------------------------------- -// -int VmbxCpPlugin::uid() const -{ - _DBGLOG2( "VmbxCpPlugin::uid=",0xEE1F4ECF ) - return 0xEE1F4ECF; -} - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -CpSettingFormItemData* VmbxCpPlugin::createSettingFormItemData( - CpItemDataHelper &itemDataHelper ) const +/*! + From base class CpPluginInterface +*/ +QList VmbxCpPlugin::createSettingFormItemData( + CpItemDataHelper &itemDataHelper) const { _DBGLOG( "VmbxCpPlugin::createSettingFormItemData" ) - // TODO: remove the legacy arguments, these are not used!!! - VmbxCpGroup *itemData = - new VmbxCpGroup( - HbDataFormModelItem::GroupItem, - QString("Voice Mailbox"), - QString("vmbxcpplugin.cpcfg"), - 0, - itemDataHelper ); - return itemData; + + QList itemList; + + VmbxCpGroup *itemData = new VmbxCpGroup( + HbDataFormModelItem::GroupItem, + QString("Voice Mailbox"), + QString("vmbxcpplugin.cpcfg"), + 0, + itemDataHelper ); + itemList << itemData; + return itemList; + _DBGLOG("VmbxCpPlugin::createSettingFormItemData created") } Q_EXPORT_PLUGIN2(VmbxCpPlugin, VmbxCpPlugin); + +//End of file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/src/vmbxuiengine.cpp --- a/vmbx/vmbxcpplugin/src/vmbxuiengine.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/src/vmbxuiengine.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -14,196 +14,169 @@ * Description: * */ - + +// System includes #include #include -#include -#include +#include + +// User includes #include "vmbxuiengine.h" #include "loggerutil.h" - -// ----------------------------------------------------------------------------- -// Comment me! -// ----------------------------------------------------------------------------- -// +/*! + Constructor +*/ VmbxUiEngine::VmbxUiEngine() : - mVmbxEngine( 0 ) + mVmbxEngine(NULL) { - _DBGLOG("VmbxUiEngine::VmbxUiEngine>") - - // TODO: test that leave vs thrown exception really works - //mVmbxEngine = QT_TRAP_THROWING( CVoiceMailbox::NewL() ); this available in qt 4.6 - // TODO: replace all this trapping&throwing using QT_TRAP_THROWING when qt 4.6 - TRAPD( error, mVmbxEngine = CVoiceMailbox::NewL(); ); - if ( error || !mVmbxEngine ) { - QT_THROW( 0 ); - } + _DBGLOG("VmbxUiEngine::VmbxUiEngine >") + QT_TRAP_THROWING(mVmbxEngine = CVoiceMailbox::NewL()); _DBGLOG("VmbxUiEngine::VmbxUiEngine <") } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// +/*! + Destructor +*/ VmbxUiEngine::~VmbxUiEngine() { _DBGLOG( "VmbxUiEngine::~VmbxUiEngine >") delete mVmbxEngine; - // TODO: check cleanup, this is a first draft! + mVmbxEngine = NULL; _DBGLOG( "VmbxUiEngine::~VmbxUiEngine <") - } +} -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void VmbxUiEngine::GetCsVoice1Number( QString& aValue ) +/*! + Getter method for primary voice number of Voice Mailbox. +*/ +void VmbxUiEngine::getCsVoice1Number(QString &aValue) { - _DBGLOG("VmbxUiEngine::GetCsVoice1Number >") + _DBGLOG("VmbxUiEngine::getCsVoice1Number >") - CVoiceMailboxEntry* vmbxEntry = NULL; TVoiceMailboxParams vmbxParams; vmbxParams.iType = EVmbxVoice; vmbxParams.iLineType = EVmbxAlsLine1; vmbxParams.iServiceId = KVmbxServiceVoice; - TInt result = mVmbxEngine->GetStoredEntry( vmbxParams, vmbxEntry ); - _DBGLOG2("VmbxUiEngine::GetCsVoice1Number, GetStoredEntry result=", result); - if ( KErrNone == result && vmbxEntry ) - { - TPtrC entryNumber( KNullDesC ); - result = vmbxEntry->GetVmbxNumber( entryNumber ); - _DBGLOG3("VmbxUiEngine::GetCsVoice1Number, GetVmbxNumber result=", - result, - " but ignore code and allow returing of an empty string to UI"); - aValue = QString( (QChar*)entryNumber.Ptr(), entryNumber.Length() ); - } - - _DBGLOG2("VmbxUiEngine::GetCsVoice1Number < , string=", aValue) + getNumber(vmbxParams, aValue); + _DBGLOG2("VmbxUiEngine::getCsVoice1Number < , string=", aValue) } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void VmbxUiEngine::GetCsVoice2Number( QString& aValue ) +/*! + Getter method for voice ALS number of Voice Mailbox. +*/ +void VmbxUiEngine::getCsVoice2Number(QString &aValue) { - _DBGLOG("VmbxUiEngine::GetCsVoice2Number >") - CVoiceMailboxEntry* vmbxEntry = NULL; + _DBGLOG("VmbxUiEngine::getCsVoice2Number >") TVoiceMailboxParams vmbxParams; vmbxParams.iType = EVmbxVoice; vmbxParams.iLineType = EVmbxAlsLine2; vmbxParams.iServiceId = KVmbxServiceVoice; - TInt result = mVmbxEngine->GetStoredEntry( vmbxParams, vmbxEntry ); - _DBGLOG2("VmbxUiEngine::GetCsVoice2Number, GetStoredEntry result=", result); - if ( KErrNone == result && vmbxEntry ) - { - TPtrC entryNumber( KNullDesC ); - result = vmbxEntry->GetVmbxNumber( entryNumber ); - _DBGLOG3("VmbxUiEngine::GetCsVoice2Number, GetVmbxNumber result=", - result, - " but ignore code and allow returing of an empty string to UI"); - aValue = QString( (QChar*)entryNumber.Ptr(),entryNumber.Length() ); - } - _DBGLOG2("VmbxUiEngine::GetCsVoice2Number < , string=", aValue) + getNumber(vmbxParams, aValue); + _DBGLOG2("VmbxUiEngine::getCsVoice2Number < , string=", aValue) } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -void VmbxUiEngine::GetCsVideo1Number( QString& aValue ) +/*! + Getter method for primary video number of Voice Mailbox. +*/ +void VmbxUiEngine::getCsVideo1Number(QString &aValue) { - _DBGLOG("VmbxUiEngine::GetCsVideo1Number >") - CVoiceMailboxEntry* vmbxEntry = NULL; + _DBGLOG("VmbxUiEngine::getCsVideo1Number >") TVoiceMailboxParams vmbxParams; vmbxParams.iType = EVmbxVideo; vmbxParams.iLineType = EVmbxAlsLine1; vmbxParams.iServiceId = KVmbxServiceVideo; - TInt result = mVmbxEngine->GetStoredEntry( vmbxParams, vmbxEntry ); - _DBGLOG2("VmbxUiEngine::GetCsVideo1Number, GetStoredEntry result=", result); - if ( KErrNone == result && vmbxEntry ) - { - TPtrC entryNumber( KNullDesC ); - result = vmbxEntry->GetVmbxNumber( entryNumber ); - _DBGLOG3("VmbxUiEngine::GetCsVideo1Number, GetVmbxNumber result=", - result, - " but ignore code and allow returing of an empty string to UI"); - aValue = QString( (QChar*)entryNumber.Ptr(),entryNumber.Length() ); - } - _DBGLOG2("VmbxUiEngine::GetCsVideo1Number < , string=", aValue) -} - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -VmbxUiEngine::TUiDefaultVoiceMailboxType VmbxUiEngine::DefaultMailboxType() -{ - _DBGLOG( "VmbxUiEngine::DefaultMailboxType") - TUiDefaultVoiceMailboxType result = EUiDefaultVmbxNone; - // TODO: get type from engine IF AND WHEN THIS FEATURE IS SUPPORTED - _DBGLOG2("VmbxUiEngine::GetCsVideo1Number < , string=", result) - return result; + getNumber(vmbxParams, aValue); + _DBGLOG2("VmbxUiEngine::getCsVideo1Number < , string=", aValue) } -// ----------------------------------------------------------------------------- -// Callback from voice mailbox engine when number has been updated -// This method notifies the UI to refresh its data. -// ----------------------------------------------------------------------------- -// -void VmbxUiEngine::HandleNotifyL( const CVoiceMailboxEntry& /*aVmbxEntry*/ ) +/*! + Callback from voice mailbox engine when number has been updated + This method notifies the UI to refresh its data. +*/ +void VmbxUiEngine::uiCsVoice1Changed(const QString& aValue) { - _DBGLOG( "VmbxUiEngine::HandleNotifyL") - /* TODO: consider is there need to pass the actual modified data - and mailbox type enum to slot. - - TODO: issue the notification request to vmbxengine, that is missing - at the moment ! - */ - emit voiceMailboxEngineEntriesUpdated(); -} - -// ----------------------------------------------------------------------------- -// Callback from voice mailbox engine when number has been updated -// This method notifies the UI to refresh its data. -// ----------------------------------------------------------------------------- -// -void VmbxUiEngine::uiCsVoice1Changed( const QString& aValue ) -{ - _DBGLOG2("VmbxUiEngine::uiCsVoice1Changed, value=",aValue) - CVoiceMailboxEntry* vmbxEntry = NULL; + _DBGLOG2("VmbxUiEngine::uiCsVoice1Changed >, value=",aValue) TVoiceMailboxParams vmbxParams; vmbxParams.iType = EVmbxVoice; vmbxParams.iLineType = EVmbxAlsLine1; vmbxParams.iServiceId = KVmbxServiceVoice; - TInt result = mVmbxEngine->GetStoredEntry( vmbxParams, vmbxEntry ); - _DBGLOG2("VmbxUiEngine::uiCsVoice1Changed, GetStoredEntry result=", result); - if ( KErrNone != result ) - { - // TODO: test that leave vs thrown exception really works - //vmbxEntry = QT_TRAP_THROWING( CVoiceMailboxEntry::NewL() ); this available in qt 4.6 - // TODO: replace all this trapping using QT_TRAP_THROWING when qt 4.6 - TRAP_IGNORE( vmbxEntry = CVoiceMailboxEntry::NewL() ); - vmbxEntry->SetServiceId( KVmbxServiceVoice ); - vmbxEntry->SetVoiceMailboxType( EVmbxVoice ); - vmbxEntry->SetVmbxAlsLineType( EVmbxAlsLine1 ); + setNumber(vmbxParams, aValue); + _DBGLOG("VmbxUiEngine::uiCsVoice1Changed <"); +} + +/*! + Callback from voice mailbox engine when number has been updated + This method notifies the UI to refresh its data. +*/ +void VmbxUiEngine::HandleNotifyL(const CVoiceMailboxEntry &aVmbxEntry) +{ + _DBGLOG( "VmbxUiEngine::HandleNotifyL") + Q_UNUSED(aVmbxEntry); + // Consider is there need to pass the actual modified data + // and mailbox type enum to slot. + // + // Issue the notification request to vmbxengine, that is missing + // at the moment ! + emit voiceMailboxEngineEntriesUpdated(); +} + +/*! + Private getter method for voice mailbox number. +*/ +void VmbxUiEngine::getNumber(const TVoiceMailboxParams &aParam, + QString &aValue) +{ + _DBGLOG("VmbxUiEngine::getNumber >") + CVoiceMailboxEntry* vmbxEntry = NULL; + TInt result = mVmbxEngine->GetStoredEntry( aParam, vmbxEntry ); + _DBGLOG2("VmbxUiEngine::getNumber, GetStoredEntry result=", result); + if ( KErrNone == result && vmbxEntry ){ + TPtrC entryNumber( KNullDesC ); + result = vmbxEntry->GetVmbxNumber( entryNumber ); + _DBGLOG3("VmbxUiEngine::getNumber, GetVmbxNumber result=", + result, + " but ignore code and allow returing of an empty string to UI"); + aValue = QString::fromUtf16 (entryNumber.Ptr(), entryNumber.Length()); + } + delete vmbxEntry; + vmbxEntry = NULL; + _DBGLOG2("VmbxUiEngine::getNumber < , string=", aValue) +} + +/*! + Setter method for voice mailbox number. +*/ +void VmbxUiEngine::setNumber(const TVoiceMailboxParams &aParam, + const QString &aValue) +{ + _DBGLOG("VmbxUiEngine::setNumber >") + + CVoiceMailboxEntry* vmbxEntry = NULL; + TInt result = mVmbxEngine->GetStoredEntry(aParam, vmbxEntry); + _DBGLOG2("VmbxUiEngine::setNumber, GetStoredEntry result=", result); + if ( KErrNone != result ){ + QT_TRAP_THROWING(vmbxEntry = CVoiceMailboxEntry::NewL()); + vmbxEntry->SetServiceId(aParam.iServiceId); + vmbxEntry->SetVoiceMailboxType(aParam.iType); + vmbxEntry->SetVmbxAlsLineType(aParam.iLineType); // Service name for cs is basically the one in service table, // but in this case it's not used for anything by vmbx. // So let's not set anything as name...fix if problems arise - } - _DBGLOG( "VmbxUiEngine::uiCsVoice1Changed: cast to TPtrC") + } + _DBGLOG( "VmbxUiEngine::setNumber: cast to TPtrC") TPtrC newNumber( reinterpret_cast( aValue.utf16() ), aValue.length() ); result = vmbxEntry->SetVmbxNumber( newNumber ); - _DBGLOG2("VmbxUiEngine::uiCsVoice1Changed, SetVmbxNumber result=", result); + _DBGLOG2("VmbxUiEngine::setNumber, SetVmbxNumber result=", result); - if ( KErrNone == result ) - { + if ( KErrNone == result ){ result = mVmbxEngine->SaveEntry( *vmbxEntry ); - } + _DBGLOG2("VmbxUiEngine::setNumber, SaveEntry result=", result); + } delete vmbxEntry; // TODO: handle error here - _DBGLOG2("VmbxUiEngine::uiCsVoice1Changed <, SaveEntry result=", result); + _DBGLOG("VmbxUiEngine::setNumber <"); } + +//End of file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxcpplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxcpplugin.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,80 @@ +/* +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implementation of the Ut_vmbxCpPlugin class +* +*/ + + +#ifndef UT_VMBXCPPLUGIN_H +#define UT_VMBXCPPLUGIN_H + +// System includes +#include +#include +#include +#include +#include +#include + + +// Class forwards +class VmbxCpPlugin; +class VmbxCpGroup; + +/*! + Mt_vmbxEngine module test class. + + Tests Ut_vmbxCpPlugin interface. + See cpp file for more information. + + @lib Ut_vmbxCpPlugin.lib +*/ + +// Class declaration +class Ut_vmbxCpPlugin : public QObject +{ + Q_OBJECT + +public: + Ut_vmbxCpPlugin(); + + virtual ~Ut_vmbxCpPlugin(); + +private slots: + + /*! + Called before the first testfunction is executed. + */ + void initTestCase(); + + /*! + Called after the last testfunction has been executed. + */ + void cleanupTestCase(); + + /*! + Test method in VmbxCpPlugin + */ + void testCreateSettingFormItemData(); + +private: //data + + /*! + Own. + */ + VmbxCpPlugin *mCpPlugin; + +}; + +#endif // _UT_VMBXCPPLUGIN_H diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxuiengine.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxuiengine.h Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,66 @@ +/* +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implementation of the Ut_VmbxUiEngine class +* +*/ + + +#ifndef UT_VMBXUIENGINE_H +#define UT_VMBXUIENGINE_H + +#include + +// Class forwards +class VmbxUiEngine; + +/*! + Ut_VmbxUiEngine module test class. + + Tests Ut_VmbxUiEngine interface. + See cpp file for more information. + + @lib Ut_VmbxUiEngine.lib +*/ +class Ut_VmbxUiEngine : public QObject +{ + Q_OBJECT + +public: + Ut_VmbxUiEngine(); + + virtual ~Ut_VmbxUiEngine(); + +private slots: + + void initTestCase(); + + void cleanupTestCase(); + + void testGetCsVoice1Number(); + + void testGetCsVoice2Number(); + + void testGetCsVideo1Number(); + + void testUiCsVoice1Changed(); + +private: //data + + /*! + Own. + */ + VmbxUiEngine *mUiEngine; +}; + +#endif // _UT_VMBXUIENGINE_H diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/src/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxcpplugin/tsrc/src/main.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,51 @@ +/* +* 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 "ut_vmbxcpplugin.h" +#include "ut_vmbxuiengine.h" + +// ----------------------------------------------------------------------------- +// main() +// Main method implemented for directing test output to a file. +// ----------------------------------------------------------------------------- +int main(int argc, char *argv[]) + { + qDebug("main() >"); + + QApplication app(argc, argv); + + qDebug("ut_vmbxuiengine"); + Ut_VmbxUiEngine tcUiEngine; + char *pass[3]; + pass[0] = argv[0]; + pass[1] = "-o"; + pass[2] = "c:\\logs\\vmbx\\ut_vmbxuiengine.txt"; + int result = QTest::qExec(&tcUiEngine, 3, pass); + qDebug("ut_vmbxuiengine result %d", result); + + + qDebug("ut_vmbxcpplugin"); + Ut_vmbxCpPlugin tcCpPlugin; + pass[2] = "c:\\logs\\vmbx\\ut_vmbxcpplugin.txt"; + result = QTest::qExec(&tcCpPlugin, 3, pass); + qDebug("ut_vmbxcpplugin result=%d", result); + + + qDebug("main() <"); + return result; + } +//End of file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailbox.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailbox.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,245 @@ +/* +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implementation of the CVoiceMailbox class +* +*/ + +// System includes +#include +#include +#include + +// ============================ MEMBER FUNCTIONS ============================= + + TInt TVoiceMailboxParams::Version() + { + qDebug("TVoiceMailboxParams::Version <>"); + return iVersion; + } + + + TVoiceMailboxParams::TVoiceMailboxParams(): + iType( EVmbxNone ), + iServiceId( KVmbxServiceIdNone ), + iLineType( EVmbxAlsLineDefault ) + { + qDebug("TVoiceMailboxParams default constructor <>"); + } + + TVoiceMailboxParams::TVoiceMailboxParams( + const CVoiceMailboxEntry& aEntry ) + { + qDebug("TVoiceMailboxParams Entry cnstructor >"); + iType = aEntry.VoiceMailboxType(); + iServiceId = aEntry.ServiceId(); + iLineType = aEntry.VmbxAlsLineType(); + qDebug("TVoiceMailboxParams Entry cnstructor <"); + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::CVoiceMailboxImpl +// C++ default constructor can NOT contain any code, that +// might leave. +// --------------------------------------------------------------------------- +// +CVoiceMailbox::CVoiceMailbox() + { + qDebug("DummyVoiceMailbox::CVoiceMailbox <>"); + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::ConstructL +// Symbian 2nd phase constructor can leave. +// --------------------------------------------------------------------------- +// +void CVoiceMailbox::ConstructL() + { + qDebug("DummyVoiceMailbox::ConstructL <>"); + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::NewL +// Two-phased constructor. +// --------------------------------------------------------------------------- +// +CVoiceMailbox* CVoiceMailbox::NewL() +{ + qDebug("DummyVoiceMailbox::NewL" ); + + CVoiceMailbox * self = NULL; + self = CVoiceMailbox::NewLC(); + CleanupStack::Pop( self ); + qDebug("DummyVoiceMailbox::NewL <"); + return self; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::NewLC +// Two-phased constructor. +// --------------------------------------------------------------------------- +// +CVoiceMailbox* CVoiceMailbox::NewLC() + { + qDebug("DummyVoiceMailbox::NewLC >"); + CVoiceMailbox* self = new( ELeave ) CVoiceMailbox; + CleanupStack::PushL( self ); + self->ConstructL(); + qDebug("DummyVoiceMailbox::NewLC <"); + return self; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::~CVoiceMailbox +// Destructor +// --------------------------------------------------------------------------- +// +CVoiceMailbox::~CVoiceMailbox() + { + qDebug("DummyVoiceMailbox::~CVoiceMailbox > <"); + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::GetStoredEntry +// +// --------------------------------------------------------------------------- +// + TInt CVoiceMailbox::GetStoredEntry( + const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry) const + { + qDebug("DummyVoiceMailbox::GetStoredEntry <>"); + Q_UNUSED(aParams); + TRAPD (err, aEntry = CVoiceMailboxEntry::NewL()); + qDebug("DummyVoiceMailbox::GetStoredEntry err %d<", err); + return err; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::SaveEntry +// Destructor +// --------------------------------------------------------------------------- +// + TInt CVoiceMailbox::SaveEntry(const CVoiceMailboxEntry& aEntry) + { + qDebug("DummyVoiceMailbox::SaveEntry <>"); + Q_UNUSED(aEntry); + return KErrNone; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::QueryNewEntry +// +// --------------------------------------------------------------------------- +// + TInt CVoiceMailbox::QueryNewEntry( + const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry) + { + qDebug("DummyVoiceMailbox::QueryNewEntry <>"); + Q_UNUSED(aParams); + TRAPD (err, aEntry = CVoiceMailboxEntry::NewL()); + return err; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::QueryChangeEntry +// +// --------------------------------------------------------------------------- +// + TInt CVoiceMailbox::QueryChangeEntry( + const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry) + { + qDebug("DummyVoiceMailbox::QueryChangeEntry <>"); + Q_UNUSED(aParams); + TRAPD (err, aEntry = CVoiceMailboxEntry::NewL()); + return err; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::QueryVmbxType +// +// --------------------------------------------------------------------------- +// + TInt CVoiceMailbox::QueryVmbxType( + TVoiceMailboxParams& aParams ) + { + qDebug("DummyVoiceMailbox::QueryVmbxType <>"); + aParams.iType = EVmbxVoice; + aParams.iServiceId = KVmbxServiceVoice; + aParams.iLineType = EVmbxAlsLine1; + return KErrNone; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::NotifyVmbxNumberChangeL +// +// --------------------------------------------------------------------------- +// + void CVoiceMailbox::NotifyVmbxNumberChangeL( + MVoiceMailboxObserver& aObserver, const TBool aNotifyOnActiveLineOnly ) + { + qDebug("DummyVoiceMailbox::NotifyVmbxNumberChangeL <>"); + Q_UNUSED(aObserver); + Q_UNUSED(aNotifyOnActiveLineOnly); + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::NotifyVmbxNumberChangeCancel +// +// --------------------------------------------------------------------------- +// + void CVoiceMailbox::NotifyVmbxNumberChangeCancel() + { + qDebug("DummyVoiceMailbox::NotifyVmbxNumberChangeCancel <>"); + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::CheckConfiguration +// +// --------------------------------------------------------------------------- +// + TBool CVoiceMailbox::CheckConfiguration( + const TVoiceMailboxParams& aParams, const TInt aFlags ) + { + qDebug("DummyVoiceMailbox::CheckConfiguration <>"); + Q_UNUSED(aParams); + Q_UNUSED(aFlags); + return ETrue; + } + +// --------------------------------------------------------------------------- +// CVoiceMailbox::GetServiceIds +// +// --------------------------------------------------------------------------- +// + TInt CVoiceMailbox::GetServiceIds( RIdArray& aProfileIds ) const + { + qDebug("DummyVoiceMailbox::GetServiceIds <>"); + Q_UNUSED(aProfileIds); + return 0; + } + + +// --------------------------------------------------------------------------- +// CVoiceMailbox::SaveProvisionedEntry +// +// --------------------------------------------------------------------------- +// + TInt CVoiceMailbox::SaveProvisionedEntry( + const CVoiceMailboxEntry& aEntry) + { + qDebug("DummyVoiceMailbox::SaveProvisionedEntry <>"); + Q_UNUSED(aEntry); + return KErrNone; + } + +// End of file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailboxentry.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailboxentry.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,353 @@ +/* +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implementation of the CVoiceMailboxEntry class +* +*/ + +// System includes +#include +#include + +// CONSTANTS + +// ============================ MEMBER FUNCTIONS ============================= + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::NewL +// +// --------------------------------------------------------------------------- +// + +EXPORT_C CVoiceMailboxEntry* CVoiceMailboxEntry::NewL() + { + qDebug( "DummyVoiceMailboxEntry::NewL >" ); + CVoiceMailboxEntry* self = CVoiceMailboxEntry::NewLC(); + CleanupStack::Pop( self ); + qDebug( "DummyVoiceMailboxEntry::NewL <" ); + return self; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::NewLC +// +// --------------------------------------------------------------------------- +// +EXPORT_C CVoiceMailboxEntry* CVoiceMailboxEntry::NewLC() + { + qDebug( "DummyVoiceMailboxEntry::NewLC >" ); + CVoiceMailboxEntry* self = new( ELeave ) CVoiceMailboxEntry; + CleanupStack::PushL( self ); + self->ConstructL(); + qDebug( "DummyVoiceMailboxEntry::NewLC <" ); + return self; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::~CVoiceMailboxEntry +// Destructor +// --------------------------------------------------------------------------- +// +CVoiceMailboxEntry::~CVoiceMailboxEntry() + { + qDebug( "DummyVoiceMailboxEntry::~CVoiceMailboxEntry >" ); + delete ivmbxNumber; + delete iVmbxBrandId; + delete ivmbxName; + qDebug( "DummyVoiceMailboxEntry::~CVoiceMailboxEntry <" ); + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::ServiceId +// Get ServiceId +// --------------------------------------------------------------------------- +// +EXPORT_C TServiceId CVoiceMailboxEntry::ServiceId() const + { + qDebug( "DummyVoiceMailboxEntry::ServiceId %d", iVmbxServiceId ); + return iVmbxServiceId; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::SetServiceId +// Set entry's service id +// --------------------------------------------------------------------------- +// +void CVoiceMailboxEntry::SetServiceId( + const TServiceId& aVmbxServiceId ) + { + qDebug( "DummyVoiceMailboxEntry::SetServiceId %d", aVmbxServiceId); + iVmbxServiceId = aVmbxServiceId; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::VoiceMailboxType +// Returns type of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TVmbxType CVoiceMailboxEntry::VoiceMailboxType( ) const + { + qDebug( "DummyVoiceMailboxEntry::VoiceMailboxType %d", iVmbxType ); + return iVmbxType; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::SetVoiceMailboxType +// Set Type of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C void CVoiceMailboxEntry::SetVoiceMailboxType( const TVmbxType& aType ) + { + qDebug( "DummyVoiceMailboxEntry::SetVoiceMailboxType %d", aType ); + iVmbxType = aType; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::VmbxAlsLineType +// Get ALS line Type of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TVmbxAlsLineType CVoiceMailboxEntry::VmbxAlsLineType() const + { + qDebug( "DummyVoiceMailboxEntry::VmbxAlsLineType >" ); + return iVmbxLineType; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::SetVmbxAlsLineType +// Set ALS line Type of the entry instance +// --------------------------------------------------------------------------- +// +void CVoiceMailboxEntry::SetVmbxAlsLineType( + const TVmbxAlsLineType& aLine ) + { + qDebug( "DummyVoiceMailboxEntry::SetVmbxAlsLineType %d >", aLine ); + if ( EVmbxAlsLineDefault == aLine ) + { + iVmbxLineType = EVmbxAlsLine1; + } + else + { + iVmbxLineType = aLine; + } + qDebug( "DummyVoiceMailboxEntry::SetVmbxAlsLineType %d <", iVmbxLineType ); + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::GetVmbxNumber +// Get number or address of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TInt CVoiceMailboxEntry::GetVmbxNumber( TPtrC& aVmbxNumber ) const + { + qDebug("DummyVoiceMailboxEntry::GetVmbxNumber >"); + TInt result( KErrNotFound ); + if ( ivmbxNumber ) + { + aVmbxNumber.Set( ivmbxNumber->Des() ); + qDebug("DummyVoiceMailboxEntry::GetVmbxNumber"); + result = KErrNone; + } + else + { + qDebug("DummyVoiceMailboxEntry::GetVmbxNumber:KNullDesC"); + aVmbxNumber.Set( KNullDesC ); + } + qDebug("DummyVoiceMailboxEntry::GetVmbxNumber <"); + return result; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::SetVmbxNumber +// Set number or address of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TInt CVoiceMailboxEntry::SetVmbxNumber( const TDesC& aVmbxNumber ) + { + qDebug("DummyVoiceMailboxEntry::SetVmbxNumber >"); + TInt result( KErrNoMemory ); + if ( aVmbxNumber.Length() > KVmbxMaxNumberLength ) + { + result = KErrArgument; + } + else + { + delete ivmbxNumber; + ivmbxNumber = aVmbxNumber.Alloc(); // Returns NULL if fails. + if ( ivmbxNumber ) + { + result = KErrNone; + } + } + qDebug("DummyVoiceMailboxEntry::SetVmbxNumber <"); + return result; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::GetVmbxAlsLineType +// Get Brand Id of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TInt CVoiceMailboxEntry::GetBrandId( TPtrC8& aBrandId ) const + { + qDebug("DummyVoiceMailboxEntry::GetBrandId >"); + TInt result( KErrNotFound ); + if ( iVmbxBrandId ) + { + aBrandId.Set( iVmbxBrandId->Des() ); + result = KErrNone; + } + else + { + aBrandId.Set( KNullDesC8 ); + } + qDebug("DummyVoiceMailboxEntry::GetBrandId <"); + return result; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::SetBrandId +// Set Brand Id of the entry instance +// --------------------------------------------------------------------------- +// +TInt CVoiceMailboxEntry::SetBrandId( const TDesC8& aBrandId ) +{ + qDebug("DummyVoiceMailboxEntry::SetBrandId >"); + TInt result( KErrNoMemory ); + if ( KVmbxMaxNumberLength < aBrandId.Length() ){ + result = KErrArgument; + }else{ + delete iVmbxBrandId; + iVmbxBrandId = aBrandId.Alloc(); + if ( iVmbxBrandId ){ + result = KErrNone; + } + } + qDebug("DummyVoiceMailboxEntry::SetBrandId <"); + return result; +} + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::GetVmbxName +// Get Name of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TInt CVoiceMailboxEntry::GetVmbxName( TPtrC& aVmbxName ) const +{ + qDebug("DummyVoiceMailboxEntry::GetVmbxName >"); + TInt result( KErrNotFound ); + if ( ivmbxName ){ + aVmbxName.Set( ivmbxName->Des() ); + result = KErrNone; + }else{ + qDebug( "DummyVoiceMailboxEntry::GetVmbxName:KNullDesC" ); + aVmbxName.Set( KNullDesC ); + } + qDebug("DummyVoiceMailboxEntry::GetVmbxName <"); + return result; +} + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::SetVmbxName +// Set Name of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TInt CVoiceMailboxEntry::SetVmbxName( const TDesC& aVmbxName ) +{ + qDebug("DummyVoiceMailboxEntry::SetVmbxName >"); + TInt result( KErrNoMemory ); + if (KVmbxMaxNumberLength < aVmbxName.Length()){ + result = KErrArgument; + }else{ + delete ivmbxName; + ivmbxName = aVmbxName.Alloc(); // Returns NULL if fails. + if ( ivmbxName ){ + result = KErrNone; + } + } + qDebug("DummyVoiceMailboxEntry::SetVmbxName <"); + return result; +} + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::UsingMemoryLocation +// Returns memory location of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C TVmbxMemoryLocation CVoiceMailboxEntry::UsingMemoryLocation( ) const + { + qDebug("DummyVoiceMailboxEntry::UsingMemoryLocation <>"); + return iUsingMemory; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::Reset +// Reset the data members of the entry instance +// --------------------------------------------------------------------------- +// +EXPORT_C void CVoiceMailboxEntry::Reset() +{ + qDebug("DummyVoiceMailboxEntry::Reset >"); + iVmbxServiceId = KVmbxServiceIdNone; + iVmbxType = EVmbxNone; + iVmbxLineType = EVmbxAlsLineDefault; + if (ivmbxNumber){ + ivmbxNumber->Des().Zero(); + qDebug("DummyVoiceMailboxEntry::Reset vmbx number"); + } + if (ivmbxName){ + ivmbxName->Des().Zero(); + qDebug("DummyVoiceMailboxEntry::Reset vmbx name"); + } + if (iVmbxBrandId){ + iVmbxBrandId->Des().Zero(); + qDebug("DummyVoiceMailboxEntry::Reset vmbx brandId"); + } + iUsingMemory = EVmbxSimMemory; + qDebug("DummyVoiceMailboxEntry::Reset <"); +} + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::SetUsingMemoryLocation +// Set using memory of the entry instance +// --------------------------------------------------------------------------- +// +void CVoiceMailboxEntry::SetUsingMemoryLocation( + const TVmbxMemoryLocation& aType ) + { + qDebug("DummyVoiceMailboxEntry::SetUsingMemoryLocation %d", aType); + iUsingMemory = aType; + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::CVoiceMailboxEntry +// C++ default constructor can NOT contain any code, that +// might leave. +// --------------------------------------------------------------------------- +// +CVoiceMailboxEntry::CVoiceMailboxEntry() + { + qDebug("DummyVoiceMailboxEntry::CVoiceMailboxEntry <>"); + } + +// --------------------------------------------------------------------------- +// CVoiceMailboxEntry::ConstructL +// Symbian 2nd phase constructor can leave. +// --------------------------------------------------------------------------- +// +void CVoiceMailboxEntry::ConstructL() + { + qDebug("DummyVoiceMailboxEntry::ConstructL <>"); + } + +// End of file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,89 @@ +/* +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implementation of the Ut_vmbxCpPlugin class +* +*/ + +// System includes +#include +#include + +// User includes +#include "vmbxcpplugin.h" +#include "ut_vmbxcpplugin.h" + +// load plugin +#include + +/*! + Ut_vmbxCpPlugin::Ut_vmbxCpPlugin + Default constructor, remember to null new members here. +*/ +Ut_vmbxCpPlugin::Ut_vmbxCpPlugin() +{ + qDebug("Ut_vmbxCpPlugin::Ut_vmbxCpPlugin >"); + qDebug("Ut_vmbxCpPlugin::Ut_vmbxCpPlugin <"); +} + +/*! + Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin +*/ +Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin() +{ + qDebug("Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin >"); + qDebug("Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin <"); +} + +/*! + Ut_vmbxCpPlugin::initTestCase + QTestLib initialization method, called for each test case. +*/ +void Ut_vmbxCpPlugin::initTestCase() +{ + qDebug("Ut_vmbxCpPlugin::initTestCase >"); + mCpPlugin = new VmbxCpPlugin(); + QVERIFY(mCpPlugin); + qDebug("Ut_vmbxCpPlugin::initTestCase <"); +} + +/*! + Ut_vmbxCpPlugin::cleanupTestCase + QTestLib cleanup method, called for each test case. +*/ +void Ut_vmbxCpPlugin::cleanupTestCase() +{ + qDebug("Ut_SatAppEngine::cleanupTestCase >"); + if ( mCpPlugin ) { + delete mCpPlugin; + qDebug("Ut_SatAppEngine::cleanupTestCase <"); + } +} + +/*! + Ut_vmbxCpPlugin::t_createSettingFormItemData + testServiceId test case + Connects to test object signal and verifies received data. +*/ +void Ut_vmbxCpPlugin::testCreateSettingFormItemData() +{ + qDebug("Ut_vmbxCpPlugin::testCreateSettingFormItemData >"); + CpItemDataHelper itemDataHelper; + QVERIFY(mCpPlugin); + QList list; + list = mCpPlugin->createSettingFormItemData(itemDataHelper); + QVERIFY2(0 != list[0], "createSettingFormItemData failed"); + qDebug("Ut_vmbxCpPlugin::testCreateSettingFormItemData <"); +} + +//End of file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/src/ut_vmbxuiengine.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxuiengine.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,125 @@ +/* +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Implementation of the Ut_VmbxUiEngine class +* +*/ + +// System includes +#include + +// User includes +#include "vmbxuiengine.h" +#include "ut_vmbxuiengine.h" + +/*! + Ut_VmbxUiEngine::Ut_VmbxUiEngine + Default constructor, remember to null new members here. +*/ +Ut_VmbxUiEngine::Ut_VmbxUiEngine() +{ + qDebug("Ut_VmbxUiEngine <>"); +} + +/*! + Ut_VmbxUiEngine::~Ut_VmbxUiEngine +*/ +Ut_VmbxUiEngine::~Ut_VmbxUiEngine() +{ + qDebug("~Ut_VmbxUiEngine <>"); +} + +/*! + Ut_VmbxUiEngine::initTestCase + QTestLib initialization method, called for each test case. +*/ +void Ut_VmbxUiEngine::initTestCase() +{ + qDebug("initTestCase >"); + mUiEngine = new VmbxUiEngine(); + QVERIFY(mUiEngine); + qDebug("initTestCase <"); +} + +/*! + Ut_VmbxUiEngine::cleanupTestCase + QTestLib cleanup method, called for each test case. +*/ +void Ut_VmbxUiEngine::cleanupTestCase() +{ + qDebug("cleanupTestCase >"); + if ( mUiEngine ) { + delete mUiEngine; + mUiEngine = NULL; + } + qDebug("cleanupTestCase <"); +} + +/*! + Ut_VmbxUiEngine::testGetCsVoice1Number + testCreateVmbxEntry test case + Connects to test object signal and verifies received data. +*/ +void Ut_VmbxUiEngine::testGetCsVoice1Number() +{ + qDebug("testGetCsVoice1Number >"); + QString voice1; + QVERIFY(mUiEngine); + mUiEngine->getCsVoice1Number(voice1); + qDebug("testGetCsVoice1Number <"); +} + +/*! + Ut_VmbxUiEngine::testCreateVmbxMailbox + CreateVmbxMailbox test case + Connects to test object signal and verifies received data. +*/ +void Ut_VmbxUiEngine::testGetCsVoice2Number() +{ + qDebug("testGetCsVoice2Number >"); + QString voice2; + QVERIFY(mUiEngine); + mUiEngine->getCsVoice2Number(voice2); + qDebug("testGetCsVoice2Number <"); +} + +/*! + Ut_VmbxUiEngine::testGetCsVideo1Number + testVmbxType test case + Connects to test object signal and verifies received data. +*/ +void Ut_VmbxUiEngine::testGetCsVideo1Number() +{ + qDebug("testGetCsVideo1Number >"); + QString video1; + QVERIFY(mUiEngine); + mUiEngine->getCsVideo1Number(video1); + + qDebug("testGetCsVideo1Number <"); +} + +/*! + Ut_VmbxUiEngine::testUiCsVoice1Changed + testServiceId test case + Connects to test object signal and verifies received data. +*/ +void Ut_VmbxUiEngine::testUiCsVoice1Changed() +{ + qDebug("testUiCsVoice1Changed >"); + QVERIFY(mUiEngine); + QString newNumber("123456"); + mUiEngine->uiCsVoice1Changed(newNumber); + qDebug("testUiCsVoice1Changed <"); +} + +//End file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.cpp --- a/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.cpp Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +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: Implementation of the Ut_vmbxCpPlugin class -* -*/ - -//qt -#include -//hb -#include -#include -#include -//symbian -#include - -#include -#include -#include -#include - -#include "vmbxuiengine.h" -#include "vmbxcpgroup.h" -#include "Ut_vmbxCpPlugin.h" - - -/*------------------------------------------------------------------------------ -This module testing project links to vmbxengine.dll. -------------------------------------------------------------------------------*/ - -// ----------------------------------------------------------------------------- -// Constants for verifying test case results -// ----------------------------------------------------------------------------- -// - - - // ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::Ut_vmbxCpPlugin -// Default constructor, remember to null new members here. -// ----------------------------------------------------------------------------- -// -Ut_vmbxCpPlugin::Ut_vmbxCpPlugin() -{ - qDebug("Ut_vmbxCpPlugin::Ut_vmbxCpPlugin >"); - qDebug("Ut_vmbxCpPlugin::Ut_vmbxCpPlugin <"); -} - -// ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin -// ----------------------------------------------------------------------------- -Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin() -{ - qDebug("Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin >"); - qDebug("Ut_vmbxCpPlugin::~Ut_vmbxCpPlugin <"); -} - - -// ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::initTestCase -// QTestLib initialization method, called for each test case. -// ----------------------------------------------------------------------------- -void Ut_vmbxCpPlugin::initTestCase() -{ - qDebug("Ut_vmbxCpPlugin::initTestCase >"); - qDebug("Ut_vmbxCpPlugin::Create Window "); - mWindow = new HbMainWindow(); - QVERIFY(mWindow); - mWindow->show(); - qDebug("Ut_vmbxCpPlugin::Create VmbxCpGroup"); - mCpGroup = new VmbxCpGroup(); - QVERIFY(mCpGroup); - qDebug("Ut_vmbxCpPlugin::Create VmbxUiEngine"); - mUiEngine = new VmbxUiEngine(); - QVERIFY(mUiEngine); - qDebug("Ut_vmbxCpPlugin::initTestCase <"); -} - - -// ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::cleanupTestCase -// QTestLib cleanup method, called for each test case. -// ----------------------------------------------------------------------------- -void Ut_vmbxCpPlugin::cleanupTestCase() -{ - qDebug("Mt_SatAppEngine::cleanupTestCase >"); - if ( mWindow ) { - delete mWindow; - } - if ( mCpGroup ) { - delete mCpGroup; - } - if ( mUiEngine ) { - delete mUiEngine; - } - qDebug("Mt_SatAppEngine::cleanupTestCase <"); -} - -// ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::testGetCsVoice1Number -// testCreateVmbxEntry test case -// Connects to test object signal and verifies received data. -// ----------------------------------------------------------------------------- -void Ut_vmbxCpPlugin::testGetCsVoice1Number() -{ - qDebug("Ut_vmbxCpPlugin::testGetCsVoice1Number >"); - QString voiceNumber; - mUiEngine->GetCsVoice1Number(voiceNumber); - if ( voiceNumber.length()) { - - } - //QVERIFY2(KErrNone == err, "create CVoiceMailboxEntry failed "); - qDebug("Ut_vmbxCpPlugin::testGetCsVoice1Number <"); -} - -// ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::testCreateVmbxMailbox -// CreateVmbxMailbox test case -// Connects to test object signal and verifies received data. -// ----------------------------------------------------------------------------- -void Ut_vmbxCpPlugin::testGetCsVoice2Number() -{ - qDebug("Ut_vmbxCpPlugin::testGetCsVoice2Number >"); - qDebug("Ut_vmbxCpPlugin::testGetCsVoice2Number <"); -} - -// ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::testGetCsVideo1Number -// testVmbxType test case -// Connects to test object signal and verifies received data. -// ----------------------------------------------------------------------------- -void Ut_vmbxCpPlugin::testGetCsVideo1Number() -{ - qDebug("Ut_vmbxCpPlugin::testGetCsVideo1Number >"); - //QVERIFY(mVmbxEntry); - //QCOMPARE(mVmbxEntry->VoiceMailboxType(), EVmbxVoice); - qDebug("Ut_vmbxCpPlugin::testGetCsVideo1Number <"); -} - -// ----------------------------------------------------------------------------- -// Ut_vmbxCpPlugin::testDefaultMailboxType -// testServiceId test case -// Connects to test object signal and verifies received data. -// ----------------------------------------------------------------------------- -void Ut_vmbxCpPlugin::testDefaultMailboxType() -{ - qDebug("Ut_vmbxCpPlugin::testDefaultMailboxType >"); - qDebug("Ut_vmbxCpPlugin::testDefaultMailboxType <"); -} - -// ----------------------------------------------------------------------------- -// main() -// Main method implemented for directing test output to a file. -// ----------------------------------------------------------------------------- -int main(int argc, char *argv[]) - { - qDebug("Ut_vmbxCpPlugin.cpp: main() >"); - QApplication app(argc, argv); - - qDebug("Ut_vmbxCpPlugin.cpp: Ut_vmbxCpPlugin"); - Ut_vmbxCpPlugin tc; - char *pass[3]; - pass[0] = argv[0]; - pass[1] = "-o"; - pass[2] = "c:\\logs\\vmbx\\Ut_vmbxCpPlugin.txt"; - const int result = QTest::qExec(&tc, 3, pass); - - qDebug("Ut_vmbxCpPlugin.cpp: main() <, result=%d", result); - return result; - } - -//End file diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.h --- a/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.h Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +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: Implementation of the Ut_vmbxCpPlugin class -* -*/ - - -#ifndef _UT_VMBXCPPLUGIN_H -#define _UT_VMBXCPPLUGIN_H - -#include -#include -#include -#include -#include -#include - - -// Class forwards -class VmbxCpGroup; -class VmbxUiEngine; -class HbMainWindow; - - -/** - * Mt_vmbxEngine module test class. - * - * Tests Ut_vmbxCpPlugin interface. - * See cpp file for more information. - * - * @lib Ut_vmbxCpPlugin.lib - * @since S60 - */ -class Ut_vmbxCpPlugin : public QObject -{ - Q_OBJECT - -public: - Ut_vmbxCpPlugin(); - - virtual ~Ut_vmbxCpPlugin(); - -private slots: - - /** - * Called before the first testfunction is executed. - * - */ - void initTestCase(); - - /** - * Called after the last testfunction has been executed. - * - */ - void cleanupTestCase(); - - /** - * Test first case,GetCsVoice1Number - * - */ - void testGetCsVoice1Number(); - - /** - * Test second case, GetCsVoice2Number - * - */ - void testGetCsVoice2Number(); - - /** - * Test middle case,GetCsVideo1Number - * - */ - void testGetCsVideo1Number(); - - /** - * Test middle case,DefaultMailboxType - * - */ - void testDefaultMailboxType(); - -private: //data - - /** - * Own. - */ - VmbxCpGroup* mCpGroup; - - /** - * Own. - */ - VmbxUiEngine* mUiEngine; - - /** - * Own. - */ - HbMainWindow* mWindow; -}; - -#endif // _UT_VMBXCPPLUGIN_H diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.pro --- a/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.pro Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.pro Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of "Eclipse Public License v1.0" @@ -28,22 +28,26 @@ symbian { INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \ /epoc32/include/mw/QtTest \ - ../../inc - - LIBS += -lvmbxcpplugin.dll\ - -lvmbxengine.dll\ - -lflogger.dll\ - -lcpframework - - + ../../inc\ + ./inc + TARGET.EPOCALLOWDLLDATA = 1 +LIBS += -lcpframework } # Input -HEADERS += ut_vmbxcpplugin.h\ - ..\inc\vmbxcpgroup.h\ - ..\inc\vmbxuiengine.h +HEADERS += inc\ut_vmbxuiengine.h\ + inc\ut_vmbxcpplugin.h \ + ..\inc\vmbxuiengine.h \ + ..\inc\vmbxcpplugin.h \ + ..\inc\vmbxcpgroup.h + -SOURCES += ut_vmbxcpplugin.cpp\ - ..\src\vmbxcpgroup.cpp\ - ..\src\vmbxuiengine.cpp +SOURCES += src\main.cpp\ + src\ut_vmbxuiengine.cpp\ + src\ut_vmbxcpplugin.cpp \ + src\ut_dummyvoicemailbox.cpp\ + src\ut_dummyvoicemailboxentry.cpp\ + ..\src\vmbxuiengine.cpp \ + ..\src\vmbxcpplugin.cpp \ + ..\src\vmbxcpgroup.cpp diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/vmbxcpplugin.pri --- a/vmbx/vmbxcpplugin/vmbxcpplugin.pri Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/vmbxcpplugin.pri Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of "Eclipse Public License v1.0" diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/vmbxcpplugin.pro --- a/vmbx/vmbxcpplugin/vmbxcpplugin.pro Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxcpplugin/vmbxcpplugin.pro Fri Apr 16 15:31:58 2010 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of "Eclipse Public License v1.0" diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/cenrep/101f874f.txt Binary file vmbx/vmbxengine/cenrep/101f874f.txt has changed diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/cenrep/backup_registration.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxengine/cenrep/backup_registration.xml Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,5 @@ + + + + + diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/conf/voicemailbox.confml Binary file vmbx/vmbxengine/conf/voicemailbox.confml has changed diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/eabi/vmbxengineu.def --- a/vmbx/vmbxengine/eabi/vmbxengineu.def Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxengine/eabi/vmbxengineu.def Fri Apr 16 15:31:58 2010 +0300 @@ -29,8 +29,4 @@ _ZNK18CVoiceMailboxEntry16VoiceMailboxTypeEv @ 28 NONAME _ZNK18CVoiceMailboxEntry19UsingMemoryLocationEv @ 29 NONAME _ZNK18CVoiceMailboxEntry9ServiceIdEv @ 30 NONAME - _ZTI13CVoiceMailbox @ 31 NONAME - _ZTI18CVoiceMailboxEntry @ 32 NONAME - _ZTV13CVoiceMailbox @ 33 NONAME - _ZTV18CVoiceMailboxEntry @ 34 NONAME diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/group/backup_registration.xml --- a/vmbx/vmbxengine/group/backup_registration.xml Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/group/bld.inf --- a/vmbx/vmbxengine/group/bld.inf Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Build information file for project vmbxengine. -* -*/ - - - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS - -//Backup registartion file -backup_registration.xml /epoc32/data/z/private/100058F5/backup_registration.xml -backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058F5/backup_registration.xml -backup_registration.xml /epoc32/release/winscw/urel/z/private/100058F5/backup_registration.xml - -// sis export -vmbxengine_stub.sis /epoc32/data/z/system/install/vmbxengine_stub.sis - -// iby export -../rom/vmbxengine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vmbxengine.iby) - -// Generic configuration interface for component cenrep settings -../conf/voicemailbox.confml MW_LAYER_CONFML(voicemailbox.confml) -../conf/voicemailbox_101F874F.crml MW_LAYER_CRML(voicemailbox_101F874F.crml) - - -PRJ_MMPFILES - -vmbxengine.mmp - - -// End of File diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/group/vmbxengine.mmp --- a/vmbx/vmbxengine/group/vmbxengine.mmp Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is a project specification file for the -* voice mailbox number interface. -* -*/ - -#include -#include - -TARGET vmbxengine.dll -TARGETTYPE dll -// Enable global writeable static data, it's needed by dll for Qt -EPOCALLOWDLLDATA - -UID 0x1000008d 0x1000590F - -CAPABILITY CAP_GENERAL_DLL - -epocstacksize 0x5000 - -USERINCLUDE ../inc - -MW_LAYER_SYSTEMINCLUDE -// Generated by qmake -SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore -SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets -SYSTEMINCLUDE /epoc32/include/mw/QtGui -SYSTEMINCLUDE /epoc32/include/mw/QtCore -SYSTEMINCLUDE /epoc32/include/stdapis/stlportv5 - -SOURCEPATH ../src - -SOURCE cvoicemailbox.cpp -SOURCE cvoicemailboxentry.cpp -SOURCE voicemailboximpl.cpp -SOURCE vmbxpbkstore.cpp -SOURCE vmbxetelconnection.cpp -SOURCE vmbxsimhandler.cpp -SOURCE vmbxcenrephandler.cpp -SOURCE vmbxutilities.cpp -SOURCE vmbxenginefactory.cpp -SOURCE vmbxenginebase.cpp -SOURCE vmbxcsvoiceengine.cpp -SOURCE vmbxcsvideoengine.cpp -SOURCE vmbxvoipengine.cpp -SOURCE vmbxuiutilities.cpp -SOURCE vmbxcenrepobserver.cpp -SOURCE vmbxsimstoreobserver.cpp -SOURCE vmbxsatrefreshobserver.cpp -SOURCE vmbxemergencycall.cpp -SOURCE vmbxobserver.cpp -// for voip -SOURCE vmbshandler.cpp -SOURCE vmspshandler.cpp -SOURCE vmsettingsuiiconfileprovider.cpp -// qt UI -SOURCE vmbxuihandler.cpp -SOURCE vmbxqtuihandler.cpp - -// library -LIBRARY euser.lib // for RArray -LIBRARY etel.lib //for Sim files read/write -LIBRARY etelmm.lib //for Sim files read/write -LIBRARY sssettings.lib // for ALS -LIBRARY phoneclient.lib // for PhCltUtils -LIBRARY featmgr.lib // for video&voip supported or not checking -LIBRARY satclient.lib // for notifying sim file refresh -LIBRARY centralrepository.lib // for CenRep keys -LIBRARY cenrepnotifhandler.lib // for Notifying CenRep value changed -LIBRARY serviceprovidersettings.lib // for VoIP -LIBRARY efsrv.lib -LIBRARY flogger.lib -// Libraries that are needed because of Qt -LIBRARY hbcore.lib -LIBRARY hbwidgets.lib -LIBRARY qtgui.lib -LIBRARY qtcore.lib -LIBRARY libc.lib -LIBRARY libm.lib -LIBRARY libdl.lib -LIBRARY libstdcppv5.lib - -OPTION CW -wchar_t on -OPTION ARMCC --visibility_inlines_hidden - -PAGED - -STDCPP - -#if defined( EABI ) -deffile ../eabi/ -#elif defined( WINS ) -// no .def file used -#elif defined( WINSCW ) -//no .def file used -#else -deffile ../BMARM/ -#endif - -// End of File diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/group/vmbxengine.pkg --- a/vmbx/vmbxengine/group/vmbxengine.pkg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: For packing vmbxengine. -; -&EN - -; Header -#{"vmbxengine"},(0x1000590f),1,1,0 - -;Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -"\epoc32\RELEASE\armv5\UREL\vmbxengine.dll"-"!:\sys\bin\vmbxengine.dll" - - diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/group/vmbxengine_stub.pkg --- a/vmbx/vmbxengine/group/vmbxengine_stub.pkg Fri Mar 19 09:40:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: For packing vmbxengine stub. -; Languages -&EN - -; Header -#{"vmbxengine"},(0x1000590F), 1, 0, 0, TYPE=SA - -;Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\vmbxengine.dll" diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/group/vmbxengine_stub.sis Binary file vmbx/vmbxengine/group/vmbxengine_stub.sis has changed diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/inc/vmbxemergencycall.h --- a/vmbx/vmbxengine/inc/vmbxemergencycall.h Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxengine/inc/vmbxemergencycall.h Fri Apr 16 15:31:58 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include -#include // from PhoneClient -#include +#include // from PhoneClient +#include // CLASS DECLARATION diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/rom/backup_registration.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxengine/rom/backup_registration.xml Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,5 @@ + + + + + diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/rom/vmbxengine.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxengine/rom/vmbxengine.pkg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: For packing vmbxengine. +; +&EN + +; Header +#{"vmbxengine"},(0x1000590f),1,1,0 + +;Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +"\epoc32\RELEASE\armv5\UREL\vmbxengine.dll"-"!:\sys\bin\vmbxengine.dll" + + diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/rom/vmbxengine_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxengine/rom/vmbxengine_stub.pkg Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,28 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: For packing vmbxengine stub. +; Languages +&EN + +; Header +#{"vmbxengine"},(0x1000590F), 1, 0, 0, TYPE=SA + +;Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\vmbxengine.dll" diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/rom/vmbxengine_stub.sis Binary file vmbx/vmbxengine/rom/vmbxengine_stub.sis has changed diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/src/vmbxemergencycall.cpp --- a/vmbx/vmbxengine/src/vmbxemergencycall.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxengine/src/vmbxemergencycall.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -16,8 +16,8 @@ */ // INCLUDE FILES -#include -#include +#include +#include #include "vmbxlogger.h" #include "vmbxemergencycall.h" diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/src/vmbxuiutilities.cpp --- a/vmbx/vmbxengine/src/vmbxuiutilities.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxengine/src/vmbxuiutilities.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -181,7 +181,9 @@ void CVmbxUiUtilities::ShowInvalidWarningDialogL() { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInvalidWarningDialogL =>" ); - iUiHandler->ShowInvalidWarningNote(); + //TODO comment out the following code to avoid crash, to be tested + //and uncommented + //iUiHandler->ShowInvalidWarningNote(); VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInvalidWarningDialogL <=" ); } @@ -193,7 +195,9 @@ void CVmbxUiUtilities::ShowSaveToPhoneNote() { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowSaveToPhoneConfirmDialog =>" ); - iUiHandler->ShowSaveToPhoneNote(); + //TODO comment out the following code to avoid crash, to be tested + //and uncommented + //iUiHandler->ShowSaveToPhoneNote(); VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowSaveToPhoneConfirmDialog <=" ); } @@ -205,7 +209,9 @@ void CVmbxUiUtilities::ShowSaveToSimNote() { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowSaveToSimNote =>" ); - iUiHandler->ShowSaveToSimNote(); + //TODO comment out the following code to avoid crash, to be tested + //and uncommented + //iUiHandler->ShowSaveToSimNote(); VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowSaveToSimNote <=" ); } @@ -217,7 +223,9 @@ void CVmbxUiUtilities::ShowVideoSavedNote() { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowVideoSavedNote =>" ); - iUiHandler->ShowVideoSavedNote(); + //TODO comment out the following code to avoid crash, to be tested + //and uncommented + //iUiHandler->ShowVideoSavedNote(); VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowVideoSavedNote <=" ); } @@ -284,6 +292,8 @@ void CVmbxUiUtilities::ShowErrorDialogL() { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowErrorDialogL =>" ); + //TODO comment out the following code to avoid crash, to be tested + //and uncommented iUiHandler->ShowInvalidNumberNote();// temporary dialog VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowErrorDialogL <=" ); } diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/src/vmbxutilities.cpp --- a/vmbx/vmbxengine/src/vmbxutilities.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxengine/src/vmbxutilities.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include // ALS changes +#include // ALS changes #include "vmbxlogger.h" #include "vmbxcenrephandler.h" diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.cpp --- a/vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.cpp Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.cpp Fri Apr 16 15:31:58 2010 +0300 @@ -21,10 +21,10 @@ #include #include -#include "../../../inc/cvoicemailbox.h" -#include "../../../inc/cvoicemailboxentry.h" -#include "../../../inc/voicemailboxdefs.h" -#include "../../../inc/mvoicemailboxobserver.h" +#include +#include +#include +#include #include "../../../inc/vmbxqtuihandler.h" #include "../../../inc/vmbxuihandler.h" @@ -102,12 +102,12 @@ // ----------------------------------------------------------------------------- void Ut_vmbxEngine::testCreateWindow() { - qDebug("Mt_vmbxEngine::testCreateWindow >"); - mWindow = new HbMainWindow(); + qDebug("Ut_vmbxEngine::testCreateWindow >"); + mWindow = new HbMainWindow(); QVERIFY(mWindow); mWindow->show(); - qDebug("Mt_vmbxEngine::testCreateWindow Windowshow"); - qDebug("Mt_vmbxEngine::testCreateWindow <"); + qDebug("Ut_vmbxEngine::testCreateWindow Windowshow"); + qDebug("Ut_vmbxEngine::testCreateWindow <"); } // ----------------------------------------------------------------------------- // Ut_vmbxEngine::testshowVmbxQueryDialog @@ -116,25 +116,25 @@ // ----------------------------------------------------------------------------- void Ut_vmbxEngine::testshowVmbxQueryDialog() { - qDebug("Mt_vmbxEngine::testshowVmbxQueryDialog >"); - QVERIFY(mQtUiHandler); - TVmbxType vmbxtype(EVmbxVoice); - TVmbxQueryMode queryMode(EVmbxDefineMode); - QString number(tr("")); - int result(0); - mQtUiHandler->showVmbxQueryDialog( - EVmbxVoice, EVmbxDefineMode, number, result); - if ( KErrCancel == result ) { - QCOMPARE(number, tr("")); - } - number = tr("123456"); - mQtUiHandler->showVmbxQueryDialog( - EVmbxVoice, EVmbxChangeMode, number, result); - - if ( KErrCancel == result ) { - QCOMPARE(number, tr("")); - } - qDebug("Mt_vmbxEngine::testshowVmbxQueryDialog <"); + qDebug("Ut_vmbxEngine::testshowVmbxQueryDialog >"); + QVERIFY(mQtUiHandler); + TVmbxType vmbxtype(EVmbxVoice); + TVmbxQueryMode queryMode(EVmbxDefineMode); + QString number(tr("")); + int result(0); + mQtUiHandler->showVmbxQueryDialog( + EVmbxVoice, EVmbxDefineMode, number, result); + if ( KErrCancel == result ) { + QCOMPARE(number, tr("")); + } + number = tr("123456"); + mQtUiHandler->showVmbxQueryDialog( + EVmbxVoice, EVmbxChangeMode, number, result); + + if ( KErrCancel == result ) { + QCOMPARE(number, tr("")); + } + qDebug("Ut_vmbxEngine::testshowVmbxQueryDialog <"); } // ----------------------------------------------------------------------------- @@ -150,9 +150,9 @@ int result; mQtUiHandler->showDefineSelectionDialog(vmbxtype, result); if (KErrCancel == result && EVmbxNone != vmbxtype) { - QFAIL("Ut_vmbxEngine::testshowDefineSelectionDialog:Cancel"); + QFAIL("Ut_vmbxEngine::testshowDefineSelectionDialog:Cancel"); } else if ( KErrNone == result && EVmbxNone == vmbxtype ){ - QFAIL("Ut_vmbxEngine::testshowDefineSelectionDialog:vmbxtype wrong"); + QFAIL("Ut_vmbxEngine::testshowDefineSelectionDialog:vmbxtype wrong"); } qDebug("Ut_vmbxEngine::testshowDefineSelectionDialog:vmbxtype%d", vmbxtype); @@ -161,6 +161,16 @@ qDebug("Ut_vmbxEngine::testshowDefineSelectionDialog <"); } + +void Ut_vmbxEngine::testshowSaveEmptyNote_data() +{ + qDebug("Ut_vmbxEngine::testshowSaveEmptyNote_data >"); + QTest::addColumn("vmbx"); + QTest::newRow("CS voice") << "CsVoice"; + QTest::newRow("CS video") << "CsVideo"; + qDebug("Ut_vmbxEngine::testshowSaveEmptyNote_data <"); +} + // ----------------------------------------------------------------------------- // Ut_vmbxEngine::testshowSaveEmptyNote // CreateVmbxMailbox test case @@ -172,11 +182,16 @@ TRAPD(err,mUiHandler = CVmbxUiHandler::NewL()); QVERIFY2(KErrNone == err, "create CVmbxUiHandler failed"); TVmbxType vmbxtype(EVmbxVoice); + QFETCH(QString, vmbx); + if ("CsVoice" == vmbx) { + vmbxtype = EVmbxVoice; + qDebug("Ut_vmbxEngine::testshowSaveEmptyNote Voice"); + } else if ("CsVideo" == vmbx) { + vmbxtype = EVmbxVideo; + qDebug("Ut_vmbxEngine::testshowSaveEmptyNote Video"); + } mUiHandler->ShowSaveEmptyNote(vmbxtype); - qDebug("Ut_vmbxEngine::testQueryVmbxMailbox show voice"); - vmbxtype = EVmbxVideo; - mUiHandler->ShowSaveEmptyNote(vmbxtype); - qDebug("Ut_vmbxEngine::testQueryVmbxMailbox show video"); + delete mUiHandler; mUiHandler = 0; qDebug("Ut_vmbxEngine::testshowSaveEmptyNote <"); @@ -189,10 +204,10 @@ // ----------------------------------------------------------------------------- void Ut_vmbxEngine::testDeleteWindow() { - qDebug("Mt_vmbxEngine::testDeleteWindow >"); + qDebug("Ut_vmbxEngine::testDeleteWindow >"); delete mWindow; mWindow = 0; - qDebug("Mt_vmbxEngine::testDeleteWindow <"); + qDebug("Ut_vmbxEngine::testDeleteWindow <"); } // ----------------------------------------------------------------------------- diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.h --- a/vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.h Fri Mar 19 09:40:14 2010 +0200 +++ b/vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.h Fri Apr 16 15:31:58 2010 +0300 @@ -91,6 +91,8 @@ */ void testCreateVmbxMailbox(); + void testshowSaveEmptyNote_data(); + /** * Test middle case,showSaveEmptyNote * diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxengine/vmbxengine.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vmbx/vmbxengine/vmbxengine.pro Fri Apr 16 15:31:58 2010 +0300 @@ -0,0 +1,124 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +# +# + +TEMPLATE = lib +TARGET = vmbxengine +DEPENDPATH += . +HEADERS += $$PUBLIC_HEADERS + +CONFIG += hb + +symbian: { + TARGET.CAPABILITY = CAP_GENERAL_DLL + TARGET.EPOCALLOWDLLDATA = 1 + TARGET.UID3=0x1000590F + INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \ + ../../inc \ + ./inc + + LIBS += -lcentralrepository.dll \ + -lcenrepnotifhandler.dll \ + -lfeatmgr.dll \ + -lphoneclient.dll \ + -lsssettings.dll \ + -letelmm.dll \ + -letel.dll \ + -lsatclient.dll \ + -lserviceprovidersettings.dll \ + -lFlogger.dll + + HEADERS += inc/mvmbxcenrephandler.h \ + inc/mvmbxcenrepobserver.h \ + inc/mvmbxchangeobserver.h \ + inc/mvmbxresourceprovider.h \ + inc/mvmbxsatrefreshobserver.h \ + inc/mvmbxservicenotify.h \ + inc/mvmbxsimstoreobserver.h \ + inc/mvmbxuihandler.h \ + inc/mvmbxuiutilities.h \ + inc/vmbshandler.h \ + inc/vmbxcenrephandler.h \ + inc/vmbxcenrepobserver.h \ + inc/vmbxcsvideoengine.h \ + inc/vmbxcsvoiceengine.h \ + inc/vmbxemergencycall.h \ + inc/vmbxenginebase.h \ + inc/vmbxenginefactory.h \ + inc/vmbxetelconnection.h \ + inc/vmbxlogger.h \ + inc/vmbxobserver.h \ + inc/vmbxpbkstore.h \ + inc/vmbxqtuihandler.h \ + inc/vmbxsatrefreshobserver.h \ + inc/vmbxsimhandler.h \ + inc/vmbxsimstoreobserver.h \ + inc/vmbxuihandler.h \ + inc/vmbxuiutilities.h \ + inc/vmbxutilities.h \ + inc/vmbxvoipengine.h \ + inc/vmsettingsuiiconfileprovider.h \ + inc/vmspshandler.h \ + inc/voicemailboxdefsinternal.h \ + inc/voicemailboxdomaincrkeys.h \ + inc/voicemailboximpl.h \ + inc/voicemailboxprivatecrkeys.h + + SOURCES += src/vmbxcenrepobserver.cpp \ + src/vmbxcsvoiceengine.cpp \ + src/vmbxcsvideoengine.cpp \ + src/vmbxcenrephandler.cpp \ + src/vmbshandler.cpp \ + src/cvoicemailboxentry.cpp \ + src/cvoicemailbox.cpp \ + src/voicemailboximpl.cpp \ + src/vmspshandler.cpp \ + src/vmsettingsuiiconfileprovider.cpp \ + src/vmbxvoipengine.cpp \ + src/vmbxutilities.cpp \ + src/vmbxuiutilities.cpp \ + src/vmbxuihandler.cpp \ + src/vmbxsimstoreobserver.cpp \ + src/vmbxsimhandler.cpp \ + src/vmbxsatrefreshobserver.cpp \ + src/vmbxqtuihandler.cpp \ + src/vmbxpbkstore.cpp \ + src/vmbxobserver.cpp \ + src/vmbxetelconnection.cpp \ + src/vmbxenginefactory.cpp \ + src/vmbxenginebase.cpp \ + src/vmbxemergencycall.cpp + + defFiles = \ + "$${LITERAL_HASH}ifdef WINS" \ + "DEFFILE bwins/vmbxengine.def" \ + "$${LITERAL_HASH}else" \ + "DEFFILE eabi/vmbxengine.def" \ + "$${LITERAL_HASH}endif" + + MMP_RULES += defFiles + + BLD_INF_RULES.prj_exports += "conf/voicemailbox.confml MW_LAYER_CONFML(voicemailbox.confml)" \ + "conf/voicemailbox_101F874F.crml MW_LAYER_CRML(voicemailbox_101F874F.crml)" \ + "rom/backup_registration.xml /epoc32/data/z/private/100058F5/backup_registration.xml" \ + "rom/backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058F5/backup_registration.xml" \ + "rom/backup_registration.xml /epoc32/release/winscw/urel/z/private/100058F5/backup_registration.xml" \ + "rom/vmbxengine_stub.sis /epoc32/data/z/system/install/vmbxengine_stub.sis" \ + "rom/vmbxengine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(vmbxengine.iby)" + +} +