Revision: 201033
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 02 Sep 2010 20:26:16 +0300
changeset 64 6aaf0276100e
parent 56 5bcb308bd24d
child 67 f6dff55cb5cd
child 72 c76a0b1755b9
Revision: 201033 Kit: 201035
phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.cpp
phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.pro
phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/group/ut_cphoneringingtonecontroller.mmp
phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller.cpp
phoneapp/phoneuicontrol/inc/cphonenumberentrymanager.h
phoneapp/phoneuiqtviewadapter/inc/phoneapplauncher.h
phoneapp/phoneuiqtviewadapter/src/phoneapplauncher.cpp
phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp
phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp
phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/ut_phonecommandextensionwrapper.pro
phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp
phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphoneringingtonecontroller_stub.cpp
phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phoneindicatorcontroller.h
phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phoneindicatorcontroller_stub.cpp
phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro
phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/ut_phonevisibilityhandler.pro
phoneapp/phoneuiutils/src/cphonecenrepproxy.cpp
phoneapp/phoneuiview2/inc/phoneuiqtview.h
phoneapp/phoneuiview2/src/phoneuiqtview.cpp
phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp
phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp
phoneengine/audiohandling/eabi/audiohandlingu.def
phoneengine/audiohandling/inc/cpeaudiofactory.h
phoneengine/loghandling/tsrc/mocks/mock_cpeloghandlingcommand.cpp
phoneengine/loghandling/tsrc/mocks/mock_cpeloginfo.cpp
phoneengine/loghandling/tsrc/ut_cpelogevent/group/ut_cpelogevent.mmp
phoneengine/loghandling/tsrc/ut_cpelogevent/src/ut_cpelogevent.cpp
phoneengine/loghandling/tsrc/ut_cpelogexternaldata/group/ut_cpelogexternaldata.mmp
phoneengine/networkhandlingstarter/inc/cnetworklistener.h
phoneengine/networkhandlingstarter/networkhandlingstarter.pro
phoneengine/networkhandlingstarter/src/cnetworklistener.cpp
phoneengine/networkhandlingstarter/src/networkhandlingstarter.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_cnetworklistener.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_cpsetrefreshhandler.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_cpsetrefreshhandler.h
phoneengine/networkhandlingstarter/tsrc/mocks/mock_psetcontainer.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_psetnetwork.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_qsysteminfo.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_tstasksettings.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqaiwrequest.cpp
phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqappmgr.cpp
phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/inc/ut_cnetworklistener.h
phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/src/ut_cnetworklistener.cpp
phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/ut_cnetworklistener.pro
phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter/ut_networkhandlingstarter.pro
phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/ut_networkhandlingstarter_p.pro
phoneengine/phonemodel/inc/cpeexternaldatahandler.h
phoneengine/phonemodel/inc/cpeparsersshandler.h
phoneengine/phonemodel/phonemodel.pro
phoneengine/phonemodel/src/cpeexternaldatahandler.cpp
phoneengine/phoneservices/tsrc/ut_phoneservices/unit_tests.cpp
phoneengine/phoneservices/tsrc/ut_phoneservices/ut_phoneservices.pro
phoneengine/phoneservices/tsrc/ut_urischemehandlerservice/unit_tests.cpp
phoneplugins/csplugin/inc/cspcall.h
phoneplugins/csplugin/inc/cspcalladdedhandler.h
phoneplugins/csplugin/inc/cspclientvideocall.h
phoneplugins/csplugin/inc/cspclientvoicecall.h
phoneplugins/csplugin/inc/cspetelcallrequester.h
phoneplugins/csplugin/inc/cspetelcallwaitingrequester.h
phoneplugins/csplugin/inc/csplogger.h
phoneplugins/csplugin/inc/csprovider.h
phoneplugins/csplugin/inc/cspvideocall.h
phoneplugins/csplugin/inc/mcspincomingcallobserver.h
phoneplugins/csplugin/inc/mcspuusmessageobserver.h
phoneplugins/csplugin/src/cspcall.cpp
phoneplugins/csplugin/src/cspcalladdedhandler.cpp
phoneplugins/csplugin/src/cspclientvideocall.cpp
phoneplugins/csplugin/src/cspclientvoicecall.cpp
phoneplugins/csplugin/src/cspetelcallrequester.cpp
phoneplugins/csplugin/src/csppubsublistener.cpp
phoneplugins/csplugin/src/csprovider.cpp
phoneplugins/csplugin/src/cspvideocall.cpp
phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp
phoneplugins/dialerwidgetplugin/src/dialerwidgetengine.cpp
phoneplugins/infowidgetplugin/tsrc/mocks/mock_infowidget.cpp
phoneplugins/infowidgetplugin/tsrc/mocks/mock_xqsettingsmanager.cpp
phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp
phoneplugins/infowidgetplugin/tsrc/ut_infowidget/ut_infowidget.pro
phoneplugins/infowidgetplugin/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp
phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h
phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp
phoneplugins/infowidgetplugin/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp
phoneplugins/phoneindicatorplugin/src/phoneindicatorservicesendertask.cpp
phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/qtestmains60.h
phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp
phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro
phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/qtestmains60.h
phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/ut_cpbarringplugin.pro
phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/qtestmains60.h
phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/ut_callsplugin.pro
phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/qtestmains60.h
phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp
phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.pro
phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp
phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cellulardatasettings/qtestmains60.h
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cellulardatasettings/ut_cellulardatasettings.pro
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/qtestmains60.h
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.cpp
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.h
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/qtestmains60.h
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.cpp
phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.pro
phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp
phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/qtestmains60.h
phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.pro
phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/qtestmains60.h
phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp
phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro
phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.pro
phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp
phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.h
phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro
phonesettings/cpphonesettingsplugins/tsrc/common/qtestmains60.h
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cmmanager.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbasesettingview.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkpluginform.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbicon.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper_p.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper_p.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper_p.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetnetworkwrapper_p.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_qsysteminfo.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_xqsettingsmanager.cpp
phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro
phoneuis/TelephonyDeviceMode/inc/CTelDMGripHandler.h
phoneuis/bubblemanager2/bubblecore/bubblecore.pro
phoneuis/bubblemanager2/bubblecore/bubblecore.qrc
phoneuis/bubblemanager2/bubblecore/src/bubblewidgetmanager.cpp
phoneuis/bubblemanager2/bubblecore/xml/bubbledocml.pri
phoneuis/bubblemanager2/tsrc/unit/loctest/loctest.cpp
--- a/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -16,9 +16,9 @@
 */
 
 #include <QtGui/QApplication.h>
+#include <QGraphicsLinearLayout>
 #include <hbaction.h>
 #include <hbmenu.h>
-#include <hbmenuitem.h>
 #include <hbpushbutton.h>
 #include <hbslider.h>
 #include <profile.hrh>
@@ -55,11 +55,9 @@
     connect(optionsMenu->addAction(tr("EProfileRingingTypeAscending"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneAscending()));  
     connect(optionsMenu->addAction(tr("EProfileRingingTypeRingingOnce"))->action(), SIGNAL(triggered()), this, SLOT(PlayRingingtoneOnce()));  
     connect(optionsMenu->addAction(tr("Stop ringingtone"))->action(), SIGNAL(triggered()), this, SLOT(StopRingingtone())); */
-    connect(optionsMenu->addAction(tr("sample.mp3"))->action(), SIGNAL(triggered()), this, SLOT(SampleMP3()));
-    connect(optionsMenu->addAction(tr("nokiatune.aac"))->action(), SIGNAL(triggered()), this, SLOT(Nokiatuneaac()));
+    connect(optionsMenu->addAction(tr("sample.mp3")), SIGNAL(triggered()), this, SLOT(SampleMP3()));
+    connect(optionsMenu->addAction(tr("nokiatune.aac")), SIGNAL(triggered()), this, SLOT(Nokiatuneaac()));
     //connect(optionsMenu->addAction(tr("Quit"))->action(), SIGNAL(triggered()), qApp, SLOT(quit()));
-    
-    
 }
 
 void t_phoneringingtoneplayer::createContent()
--- a/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/tsrc/t_phoneringingtoneplayer/t_phoneringingtoneplayer.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -25,8 +25,10 @@
                    /epoc32/include/platform \
                    ../../../phoneuiutils/inc \
                    ../../../phoneuiview2/src \
-                   ../../../phoneuiqtviewadapter/src \
+                   ../../../phoneuiqtviewadapter/inc \
                    ../../inc \
+                   ../../../phonemediatorcenter/inc
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
     LIBS += -lphoneringingtoneplayer \
             -lphoneuiutils
--- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/group/ut_cphoneringingtonecontroller.mmp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/group/ut_cphoneringingtonecontroller.mmp	Thu Sep 02 20:26:16 2010 +0300
@@ -25,14 +25,12 @@
 CAPABILITY      ALL -TCB -DRM
 VENDORID        VID_DEFAULT
 
-SOURCEPATH              ../Src
+SOURCEPATH              ../src
 SOURCE                  ut_cphoneringingtonecontroller.cpp
-
-// Sources required by the test suite
 SOURCE                  ut_cphoneringingtonecontroller_dllmain.cpp
 
 // Code under test
-SOURCEPATH             ../../../../src
+SOURCEPATH              ../../../src
 SOURCE                  cphoneringingtonecontroller.cpp
 SOURCE                  cphoneringingtone.cpp
 
@@ -40,32 +38,25 @@
 SOURCE                  mock_cphoneringingtoneplayer.cpp
 SOURCE                  mock_cphonettsplayer.cpp 
 
-
-USERINCLUDE             ../Src
+USERINCLUDE             ../src
+USERINCLUDE             ../../../inc
+USERINCLUDE             ../../../../phoneuiqtviewadapter/inc
+USERINCLUDE             ../../../../phoneuicontrol/inc
+USERINCLUDE             ../../../../phoneuiutils/inc
+USERINCLUDE             ../../../../phoneui2/srcdata
+USERINCLUDE             ../../../../phonemediatorcenter/inc
 
-USERINCLUDE             ../../../../../phoneuiqtviewadapter/src
-USERINCLUDE             ../../../../../phoneuicontrol/inc
-USERINCLUDE             ../../../../../phoneuiutils/inc
-USERINCLUDE             ../../../../../phoneui2/srcdata
-USERINCLUDE             ../../../../../phoneringingtoneplayer/inc
-
-APP_LAYER_SYSTEMINCLUDE                 // Application layer domain APIs
-SYSTEMINCLUDE           ../../../../inc     // phoneuicontrol inc
+APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE           /epoc32/include/digia/eunit
 SYSTEMINCLUDE           /epoc32/include/mda/client
-SYSTEMINCLUDE           ../../../../../../inc    // phone internal headers
-
-
 SYSTEMINCLUDE           /epoc32/include/ecom
 SYSTEMINCLUDE           /epoc32/include/mmf/common
 SYSTEMINCLUDE           /epoc32/include/mmf/server
-
-
+SYSTEMINCLUDE           ../../../../../inc    // phone internal headers
 
 LIBRARY                 eunit.lib
 LIBRARY                 eunitutil.lib
-
-
+LIBRARY                 symbianmock.lib
 LIBRARY                 phoneuiutils.lib
 LIBRARY                 euser.lib
 LIBRARY                 efsrv.lib                           // TParse
@@ -81,5 +72,6 @@
 LIBRARY                 mediatorclient.lib
 LIBRARY                 audiooutputrouting.lib  // Ringingtone output
 LIBRARY                 platformenv.lib                 // PathInfo
-LIBRARY                 symbianmock.lib
+LIBRARY                 cone.lib
 
+EPOCALLOWDLLDATA
--- a/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/tsrc/ut_cphoneringingtonecontroller/src/ut_cphoneringingtonecontroller.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -90,7 +90,7 @@
 void ut_cphoneringingtonecontroller::Teardown(  )
     {
     delete CPhoneCenRepProxy::Instance();
-    UserSvr::DllFreeTls(KUidCenRepProxySingleton);
+    UserSvr::DllFreeTls(KUidCenRepProxySingleton.iUid);
     
     delete iRingingtoneplayer; 
     iRingingtoneplayer = NULL;
--- a/phoneapp/phoneuicontrol/inc/cphonenumberentrymanager.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonenumberentrymanager.h	Thu Sep 02 20:26:16 2010 +0300
@@ -53,7 +53,7 @@
         * @param aCbaManager: Handle to cphonecbamanager.
         * @return CPhoneNumberEntryManager* object  
         */
-        static CPhoneNumberEntryManager* CPhoneNumberEntryManager::NewL(
+        static CPhoneNumberEntryManager* NewL(
                     CPhoneState* aState,
                     MPhoneViewCommandHandle& aViewCommandHandle,
                     MPhoneStateMachine& aStateMachine,
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneapplauncher.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneapplauncher.h	Thu Sep 02 20:26:16 2010 +0300
@@ -63,7 +63,8 @@
             const QString& service,
             const QString& interface, 
             const QString& operation,
-            const QList<QVariant>& arguments);
+            const QList<QVariant>& arguments,
+            const bool foreground);
 };
 
 #endif // PHONEAPPLAUNCHER_H
--- a/phoneapp/phoneuiqtviewadapter/src/phoneapplauncher.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneapplauncher.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -17,9 +17,9 @@
 
 #include <devicelockaccessapi.h>
 #include <xqservicerequest.h>
-#include <logsservices.h>
 #include <xqappmgr.h>
 #include <xqrequestinfo.h>
+#include <xqaiwdecl.h>
 
 #include "phoneapplauncher.h"
 #include "qtphonelog.h"
@@ -58,7 +58,8 @@
         "com.nokia.services.hbserviceprovider",
         "conversationview",
         "send(QString,QString,QString)",
-        arguments);
+        arguments,
+        true);
 }
 
 /*!
@@ -71,7 +72,8 @@
         "com.nokia.services.phonebookappservices",
         "Launch",
         "launch()",
-        arguments);
+        arguments,
+        true);
 }
 
 /*!
@@ -83,16 +85,17 @@
         const QString &dialpadText)
 {
     QVariantMap map;
-    map.insert("view_index", QVariant(activatedView));
-    map.insert("show_dialpad", QVariant(showDialpad));
-    map.insert("dialpad_text", QVariant(dialpadText));
+    map.insert(XQLOGS_VIEW_INDEX, QVariant(activatedView));
+    map.insert(XQLOGS_SHOW_DIALPAD, QVariant(showDialpad));
+    map.insert(XQLOGS_DIALPAD_TEXT, QVariant(dialpadText));
     QList<QVariant> args;
     args.append(QVariant(map));
     sendServiceRequest(
         "logs",
-        "com.nokia.symbian.ILogsView",
-        "show(QVariantMap)",
-        args);
+        XQI_LOGS_VIEW,
+        XQOP_LOGS_SHOW,
+        args,
+        false);
 }
 
 /*!
@@ -102,7 +105,8 @@
         const QString &service, 
         const QString &interface,
         const QString &operation,
-        const QList<QVariant> &arguments)
+        const QList<QVariant> &arguments, 
+        const bool foreground)
 {
     int err = -1;
     TRAP_IGNORE(
@@ -124,9 +128,13 @@
             PHONE_TRACE1("service not found");
             return;
         }
-        XQRequestInfo info;
-        info.setForeground(true);
-        request->setInfo(info);
+
+        if (foreground) {
+            XQRequestInfo info;
+            info.setForeground(true);
+            request->setInfo(info);
+        }
+        
         request->setArguments(arguments);
         QVariant retValue(-1);
         if (!request->send(retValue)) {
--- a/phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -30,7 +30,7 @@
 #include <ctsydomaincrkeys.h>
 #include <xqaiwrequest.h>
 #include <xqappmgr.h>
-#include <logsservices.h>
+#include <xqaiwdecl.h>
 #endif
 
 namespace PhoneIndicatorControllerKeys{
@@ -278,16 +278,16 @@
         QString operation;
         QVariantHash hash;
         QVariantMap map;
-        int interaction = data.value("interaction").toInt();                
+        int interaction = data.value("interaction").toInt();
         
         switch(interaction){
             case OpenMissedCallView:
                 service = "logs";
-                interface = "com.nokia.symbian.ILogsView";
-                operation = "show(QVariantMap)";
-                map.insert("view_index",QVariant((int)LogsServices::ViewMissed));
-                map.insert("show_dialpad",QVariant(false));
-                map.insert("dialpad_text", QVariant(QString()));
+                interface = XQI_LOGS_VIEW;
+                operation = XQOP_LOGS_SHOW;
+                map.insert(XQLOGS_VIEW_INDEX , QVariant((int)XQService::LogsViewAll));
+                map.insert(XQLOGS_SHOW_DIALPAD, QVariant(false));
+                map.insert(XQLOGS_DIALPAD_TEXT, QVariant(QString()));
                 args.append(QVariant(map));
                 break;
             case OpenCallUi:            
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -60,8 +60,7 @@
 #include <hbstringutil.h>
 #include <AknSgcc.h>
 #include <AknCapServerClient.h>
-#include <logsservices.h>
-
+#include <xqaiwdecl.h>
 
 
 //CONSTANTS
@@ -1278,7 +1277,7 @@
     if (phoneVisible) { 
         // Activate logs dialer only if telephone is on the top.
         m_appLauncher->launchLogs(
-                LogsServices::ViewAll,
+                XQService::LogsViewAll,
                 true,
                 QString::fromUtf16(
                     entryContent->String()->Ptr(),
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/ut_phonecommandextensionwrapper.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/ut_phonecommandextensionwrapper.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -22,6 +22,7 @@
 INCLUDEPATH += .
 CONFIG += hb
 CONFIG += qtestlib
+DEFINES += BUILD_XQPLUGINS_DLL
 
 symbian {
 
@@ -36,6 +37,7 @@
                    ../../../../inc \
                    ../../../phoneui2/srcdata
 
+	HEADERS += /epoc32/include/mw/xqpluginloader.h
 
     TARGET.CAPABILITY = ALL -TCB
     DEFINES += FT_SYMBIAN_INTEGRATION
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -124,7 +124,7 @@
 {
     const QString KDefaultSoftRejectText = 
         hbTrId("txt_phone_setlabel_soft_reject_val_default_text");
-    EXPECT(PhoneAppLauncher::launchMessaging)
+    EXPECT(PhoneAppLauncher, launchMessaging)
         .with(KNumber, KName, KDefaultSoftRejectText);
     
     TPhoneCmdParamSfiData sfiParam;
@@ -138,12 +138,12 @@
 
 void UT_PhoneMessageController::t_openSoftRejectEditorUserDefinedText()
 {
-    EXPECT(PhoneAppLauncher::launchMessaging)
+    EXPECT(PhoneAppLauncher, launchMessaging)
         .with(KNumber, KName, KUserDefinedSoftRejectText);
-    EXPECT(CPhoneCenRepProxy::GetInt)
+    EXPECT(CPhoneCenRepProxy, GetInt)
         .with(KCRUidTelephonySettings, KSettingsSoftRejectDefaultInUse, 0)
         .willOnce(invoke(enableUserDefinedSoftRejectText));
-    EXPECT(CPhoneCenRepProxy::GetString)
+    EXPECT(CPhoneCenRepProxy, GetString)
         .with(KCRUidTelephonySettings, KSettingsSoftRejectText, KNullDesC())
         .willOnce(invoke(setUserDefinedSoftRejectText));
     
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphoneringingtonecontroller_stub.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphoneringingtonecontroller_stub.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -241,21 +241,21 @@
     //__LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingToneController::CoverUIPlayVideoRingingToneL()" );
 
     TBool showVideo( EFalse );
-
+    /*
     RBuf8 data;
     CleanupClosePushL( data );
     data.CreateL( aRingingTone.FileName().Length() );
     data.Copy( aRingingTone.FileName() );
-    /*TInt err = iMediatorSender->IssueCommand( 
+    TInt err = iMediatorSender->IssueCommand( 
     	EPhoneCmdCoverUiShowMultimediaRingingTone, 
 	    data );
     if ( err == KErrNone )
         {
         showVideo = ETrue;
         iActiveCoverUICommand = ETrue;
-        }*/
+        }
     CleanupStack::PopAndDestroy(); //data 
-
+    */
     return showVideo;
     }
 
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phoneindicatorcontroller.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phoneindicatorcontroller.h	Thu Sep 02 20:26:16 2010 +0300
@@ -10,6 +10,8 @@
 
 #include <QObject>
 
+class PhoneVisibilityHandler;
+
 extern bool m_setActiveCallCalled;
 extern bool m_clearActiveCallCalled;
 extern bool m_enableCallIndCalled;
@@ -19,7 +21,9 @@
     {
     Q_OBJECT
 public:
-    PhoneIndicatorController(QObject *parent);
+    PhoneIndicatorController(
+        PhoneVisibilityHandler& visibilityHandler,
+        QObject *parent = 0);
     virtual ~PhoneIndicatorController();
     
     void setActiveCallData();
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phoneindicatorcontroller_stub.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phoneindicatorcontroller_stub.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -12,8 +12,10 @@
 bool m_enableCallIndCalled;
 bool m_disableCallIndCalled;
 
-PhoneIndicatorController::PhoneIndicatorController(QObject *parent):
-QObject(parent)
+PhoneIndicatorController::PhoneIndicatorController(
+    PhoneVisibilityHandler& visibilityHandler, QObject *parent)
+    :
+    QObject(parent)
 {
     m_setActiveCallCalled = false;
     m_clearActiveCallCalled = false;
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -48,6 +48,10 @@
     LIBS += -lakncapserverclient
     LIBS += -lxqsettingsmanager
     LIBS += -llogsengine
+    LIBS += -lapgrfx
+    LIBS += -lavkon
+    LIBS += -lws32
+    LIBS += -lcone
     
     TARGET.CAPABILITY = ALL -TCB
     DEFINES += FT_SYMBIAN_INTEGRATION
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/ut_phonevisibilityhandler.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/ut_phonevisibilityhandler.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -30,7 +30,7 @@
     INCLUDEPATH += \epoc32\include\platform\mw \
                    \epoc32\include\platform \
                    \epoc32\include\platform\app \
-	                 \epoc32\include\mw \
+	               \epoc32\include\mw \
                    \sf\app\phone\inc \
                    ../../../phoneuiutils/inc/ \
                    ../../../phonemediatorcenter/inc/ \
@@ -40,7 +40,10 @@
                    ../../../phoneui2/srcdata
 
     LIBS += -ltelephonyservice
-        
+    LIBS += -lapgrfx
+    LIBS += -lws32
+    LIBS += -lcone
+
     TARGET.CAPABILITY = ALL -TCB
     DEFINES += FT_SYMBIAN_INTEGRATION
 }
--- a/phoneapp/phoneuiutils/src/cphonecenrepproxy.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiutils/src/cphonecenrepproxy.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -417,7 +417,7 @@
     const TInt count = iObserverArray->Count();
     for ( TInt i = count-1; i >=0; i-- )
         {
-        const TCenRepObserverTag& observerTag = iObserverArray->At( i );
+        iObserverArray->At( i );
         iObserverArray->Delete( i );
         }
     }
--- a/phoneapp/phoneuiview2/inc/phoneuiqtview.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiview2/inc/phoneuiqtview.h	Thu Sep 02 20:26:16 2010 +0300
@@ -30,7 +30,7 @@
 class HbToolBar;
 class HbVolumeSliderPopup;
 class Dialpad;
-class XqKeyCapture;
+class XQKeyCapture;
 class DialpadKeyHandler;
 
 #ifdef BUILD_PHONEUIQTVIEW
@@ -391,7 +391,7 @@
     HbAction            *m_backAction;
     Dialpad             *m_dialpad;
     QSignalMapper       *m_menuSignalMapper;
-    XqKeyCapture        *m_keyCapture;
+    XQKeyCapture        *m_keyCapture;
     QSystemNetworkInfo  *m_networkInfo;
     QList<Qt::Key>      m_keyCaptures;
     DialpadKeyHandler   *m_dialpadKeyHandler;
--- a/phoneapp/phoneuiview2/src/phoneuiqtview.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuiview2/src/phoneuiqtview.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -61,7 +61,7 @@
     setTitle(networkName);
 
     // Capturing long press of end key
-    m_keyCapture = new XqKeyCapture();
+    m_keyCapture = new XQKeyCapture();
     
     // Dialpad
     m_dialpad = new Dialpad(m_window);
@@ -189,17 +189,19 @@
 
     if (mapper) {
         QList<HbAction *> *actions = m_bubbleActionMap.value(bubbleId);
+        if (actions) {
+            foreach (HbAction *action, *actions ) {
+                mapper->removeMappings(action);
+            }
 
-        foreach (HbAction *action, *actions ) {
-            mapper->removeMappings(action);
-            delete action;
+            qDeleteAll(*actions);
+            actions->clear();
+            delete actions;
         }
-
-        actions->clear();
+        
         m_bubbleMap.remove(bubbleId);
         m_bubbleActionMap.remove(bubbleId);
         delete mapper;
-        delete actions;
     }
 
 }
--- a/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -575,8 +575,6 @@
         case MEngineMonitor::EPEMessageTransferring:
             {
             iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveGlobalNote );
-            CPhoneState* phoneState = 
-                static_cast< CPhoneState* >( iStateMachine.State() );    
             SendGlobalInfoNoteL( EPhoneInCallTransferred );
             break; 
             }
--- a/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -206,9 +206,6 @@
     {
     __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
         "CPhoneUnattendedTransferCmdHandler::CloseTransferDialerL" )
-    
-    CPhoneState* phoneState = 
-        static_cast< CPhoneState* >( iStateMachine.State() );
     }
 
 
--- a/phoneengine/audiohandling/eabi/audiohandlingu.def	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/audiohandling/eabi/audiohandlingu.def	Thu Sep 02 20:26:16 2010 +0300
@@ -51,4 +51,6 @@
 	_ZThn4_NK12CPEAudioData16GetAudioMuteSyncERi @ 50 NONAME
 	_ZThn4_NK12CPEAudioData18GetAudioVolumeSyncERi @ 51 NONAME
 	_ZThn68_N15CPEGsmAudioData15HandleDTMFEventEN16MCCEDtmfObserver13TCCEDtmfEventEi5TChar @ 52 NONAME
+	_ZTI15CPEAudioFactory @ 53 NONAME
+	_ZTV15CPEAudioFactory @ 54 NONAME
 
--- a/phoneengine/audiohandling/inc/cpeaudiofactory.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/audiohandling/inc/cpeaudiofactory.h	Thu Sep 02 20:26:16 2010 +0300
@@ -52,7 +52,7 @@
 *  @since Series60_5.0
 */  
 
-NONSHARABLE_CLASS( CPEAudioFactory ) : public CBase
+class CPEAudioFactory : public CBase
     {
     public: 
         
--- a/phoneengine/loghandling/tsrc/mocks/mock_cpeloghandlingcommand.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/loghandling/tsrc/mocks/mock_cpeloghandlingcommand.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -116,7 +116,7 @@
         const CLogEvent& aLogEvent
         )
     { 
-    SMC_MOCK_METHOD1( TInt, CLogEvent& , aLogEvent)     
+    SMC_MOCK_METHOD1( TInt, const CLogEvent& , aLogEvent)     
     }
 
 // -----------------------------------------------------------------------------
--- a/phoneengine/loghandling/tsrc/mocks/mock_cpeloginfo.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/loghandling/tsrc/mocks/mock_cpeloginfo.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -154,7 +154,7 @@
 //
 void CPELogInfo::SetPhoneNumber( const TPEPhoneNumber& aPhoneNumber )
     {
-    SMC_MOCK_METHOD1( void, TPEPhoneNumber&, aPhoneNumber )	
+    SMC_MOCK_METHOD1( void, const TPEPhoneNumber&, aPhoneNumber )	
     }
 
 
@@ -174,7 +174,7 @@
 //
 void CPELogInfo::SetName( const TPEContactName& aName )
     {
-    SMC_MOCK_METHOD1( void, TPEContactName&, aName )	
+    SMC_MOCK_METHOD1( void, const TPEContactName&, aName )	
     }
 
 
@@ -373,7 +373,7 @@
 //
 void CPELogInfo::SetVoipAddress( const TPEPhoneNumber& aVoipAddress )
     {
-    SMC_MOCK_METHOD1( void, TPEPhoneNumber&, aVoipAddress )
+    SMC_MOCK_METHOD1( void, const TPEPhoneNumber&, aVoipAddress )
     }
 
 
@@ -393,7 +393,7 @@
 //
 void CPELogInfo::SetMyAddress( const TPEPhoneNumber& aMyAddress )
     {
-    SMC_MOCK_METHOD1( void, TPEPhoneNumber&, aMyAddress )
+    SMC_MOCK_METHOD1( void, const TPEPhoneNumber&, aMyAddress )
     }
 
 
--- a/phoneengine/loghandling/tsrc/ut_cpelogevent/group/ut_cpelogevent.mmp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/loghandling/tsrc/ut_cpelogevent/group/ut_cpelogevent.mmp	Thu Sep 02 20:26:16 2010 +0300
@@ -66,3 +66,5 @@
 LIBRARY             engineinfo.lib
 LIBRARY             serviceprovidersettings.lib
 LIBRARY             symbianmock.lib
+
+EPOCALLOWDLLDATA
--- a/phoneengine/loghandling/tsrc/ut_cpelogevent/src/ut_cpelogevent.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/loghandling/tsrc/ut_cpelogevent/src/ut_cpelogevent.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -266,7 +266,7 @@
     _LIT( KVoipAddress, "remotecontact@domain.com" );
 
     iMockContext->ExpectCallL( "CPELogInfo::CallState" ).
-        ReturnsL( EPEStateIdle ).
+        ReturnsL<TPEState>( EPEStateIdle ).
         TimesL( 2 );
     
     iMockContext->ExpectCallL( "CPELogHandling::LogStringDelivery" ).
@@ -371,7 +371,7 @@
     _LIT( KVoipAddress, "remotecontact@domain.com" );
 
     iMockContext->ExpectCallL( "CPELogInfo::CallState" ).
-        ReturnsL( EPEStateIdle );
+        ReturnsL<TPEState>( EPEStateIdle );
     
     iMockContext->ExpectCallL( "CPELogHandling::LogStringDelivery" ).
         ReturnsL( test );
@@ -413,7 +413,7 @@
         TimesL( 4 );
     
     iMockContext->ExpectCallL( "CPELogInfo::CallState" ).
-        ReturnsL( EPEStateIdle ).
+        ReturnsL<TPEState>( EPEStateIdle ).
         TimesL( 2 );
     
     iMockContext->ExpectCallL( "CPELogInfo::MissedCall" ).
@@ -434,7 +434,7 @@
     _LIT( KMyName, "Tester" );
 
     iMockContext->ExpectCallL( "CPELogInfo::CallState" ).
-        ReturnsL( EPEStateIdle );
+        ReturnsL<TPEState>( EPEStateIdle );
     
     iMockContext->ExpectCallL( "CPELogHandling::LogStringDelivery" ).
         ReturnsL( test );
--- a/phoneengine/loghandling/tsrc/ut_cpelogexternaldata/group/ut_cpelogexternaldata.mmp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/loghandling/tsrc/ut_cpelogexternaldata/group/ut_cpelogexternaldata.mmp	Thu Sep 02 20:26:16 2010 +0300
@@ -61,3 +61,5 @@
 LIBRARY             cce.lib
 LIBRARY             bafl.lib                // Descriptor arrays
 LIBRARY             symbianmock.lib
+
+EPOCALLOWDLLDATA
--- a/phoneengine/networkhandlingstarter/inc/cnetworklistener.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/inc/cnetworklistener.h	Thu Sep 02 20:26:16 2010 +0300
@@ -23,12 +23,17 @@
 #include <e32base.h>
 #include <nwhandlingengine.h>
 #include <qsysteminfo.h>
+#include <MSSSettingsRefreshObserver.h>
+#include <MPsetNetworkInfoObs.h>
 
 // User includes
 
 // Forward declarations
 class CNWSession;
 class MNetworkListenerObserver;
+class CPsetNetwork;
+class CPsetContainer;
+class CPSetRefreshHandler;
 
 using namespace QtMobility;
 
@@ -36,7 +41,9 @@
  *  Network info listener.
  */
 NONSHARABLE_CLASS( CNetworkListener ) : public CBase, 
-    public MNWMessageObserver
+    public MNWMessageObserver,
+    public MSSSettingsRefreshObserver,
+    public MPsetNetworkInfoObserver
     {
 public:
 
@@ -66,6 +73,101 @@
     void HandleNetworkError( const TNWOperation aOperation, TInt aErrorCode );
     
     static TInt NWLostDelayCallBack(TAny* aParam);
+    
+    static TInt NWSimRefreshCallBack(TAny* aParam);
+    
+    /**
+     * From MSSSettingsRefreshObserver.
+     * Refresh query. Client should determine whether it allow the
+     * refresh to happen.
+     * 
+     * @param aType  Refresh type.
+     * @param aFiles Elementary files which are to be changed. 
+     *               May be zero length. 
+     * @return ETrue to allow refresh, EFalse to decline refresh.
+     */
+    TBool AllowRefresh(
+        const TSatRefreshType aType,
+        const TSatElementaryFiles aFiles );
+
+    /**
+     * From MSSSettingsRefreshObserver.
+     * Notification of refresh.
+     * 
+     * @param aType Type of refresh which has happened.
+     * @param aFiles List of elementary files which have been changed.
+     *               May be zero length.
+      */
+    void Refresh(
+        const TSatRefreshType aType,
+        const TSatElementaryFiles aFiles );
+   
+    /**
+    * Shows notes when network information received.
+    *
+    * @param aInfoArray Network information. Receiver owns the array.
+    * @param aResult Result of action.
+    */
+    void HandleNetworkInfoReceivedL( 
+        const CNetworkInfoArray* aInfoArray, const TInt aResult );
+    
+    /**
+    * Shows notes when requested for current network information.
+    *
+    * @param aCurrentInfo Current network information.
+    * @param aResult Result of action.
+    */
+    void HandleCurrentNetworkInfoL( 
+        const MPsetNetworkSelect::TCurrentNetworkInfo& aCurrentInfo, 
+        const TInt aResult );
+    
+    /**
+    *  DEPRECATED.
+    */
+    void HandleNetworkChangedL( 
+        const MPsetNetworkSelect::TNetworkInfo& aCurrentInfo,
+        const MPsetNetworkSelect::TCurrentNetworkStatus aStatus, 
+        const TInt aResult );    
+
+    /**
+    * Shows notes when network change has been approved.
+    *
+    * @param aCurrentInfo Current network information.
+    * @param aStatus Current network status.
+    * @param aResult Result of action.
+    */
+    void HandleNetworkChangedL( 
+        const MPsetNetworkSelect::TNetworkInfo& aCurrentInfo,
+        const RMobilePhone::TMobilePhoneRegistrationStatus& aStatus, 
+        const TInt aResult );    
+
+    /**
+    * Searches for networks that have coverage.
+    *
+    * @param aRequest Type of request that is being handled.
+    */
+    void HandleSearchingNetworksL( TServiceRequest aRequest );
+
+    /**
+    * Handles user request to register to specific network.
+    *
+    * @param aOngoing Is there an ongoing request.
+    */
+    void HandleRequestingSelectedNetworkL( TBool aOngoing );
+
+    /**
+    * Handles notes when call is active.
+    */
+    void HandleCallActivatedL();
+
+    /**
+    * Handles errors.
+    * 
+    * @param aRequest current request.
+    * @param aError error code.
+    */
+    void HandleNetworkErrorL( const MPsetNetworkInfoObserver::TServiceRequest aRequest,
+        const TInt aError );
 
 private:
     
@@ -129,6 +231,25 @@
      * Own.
      */
     QSystemDeviceInfo* iDeviceInfo;
+    
+    /**
+     * PhoneSettings container.
+     * Own.
+     */
+    CPsetContainer* iContainer;
+    
+    /**
+     * PhoneSettings engine object.
+     * Own.
+     */
+    CPsetNetwork* iSettingsEngine;
+    
+    /**
+     * PhoneSettings refresh handler.
+     * Own.
+     */
+    CPSetRefreshHandler* iRefreshHandler;
+    
     };
     
 #endif // CNETWORKLISTENER_H
--- a/phoneengine/networkhandlingstarter/networkhandlingstarter.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/networkhandlingstarter.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -33,7 +33,9 @@
     LIBS += -lxqservice
     LIBS += -lxqserviceutil
     LIBS += -lcpframework
-    
+    LIBS += -lphonesettings
+    LIBS += -ltstaskmonitorclient
+
     BLD_INF_RULES.prj_exports +=  \
      "./rom/networkhandlingstarter.iby    CORE_APP_LAYER_IBY_EXPORT_PATH(networkhandlingstarter.iby)"
      
--- a/phoneengine/networkhandlingstarter/src/cnetworklistener.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/src/cnetworklistener.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -18,6 +18,9 @@
 #include <cnwsession.h>
 #include <BTSapDomainPSKeys.h>
 #include <startupdomainpskeys.h>
+#include <PsetContainer.h>
+#include <PsetNetwork.h>
+#include <PsetSAObserver.h>
 
 #include "cnetworklistener.h"
 #include "mnetworklistenerobserver.h"
@@ -27,6 +30,7 @@
 
 // 1-minute timeout before showing soft notification
 const TInt KNetworkLostTimeout = 60*1000000;
+const TInt KSimRefreshAsynronationTimeout = 1000000;
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -55,6 +59,14 @@
     iTimer = CPeriodic::NewL(CActive::EPriorityStandard);
     QT_TRYCATCH_LEAVING(iDeviceInfo = new QSystemDeviceInfo())
     
+    iContainer = CPsetContainer::NewL();
+    iRefreshHandler = iContainer->CreateRefreshHandlerL();
+    iRefreshHandler->NotifyFileChangeL(
+            *this,
+            KCsp1Ef,
+            EFileChangeNotification );
+    iSettingsEngine = iContainer->CreateNetworkObjectL(*this);
+    
     DPRINT << ": OUT";
 }
 
@@ -84,6 +96,9 @@
     delete iSession;
     delete iTimer;
     delete iDeviceInfo;
+    delete iSettingsEngine;
+    delete iRefreshHandler;
+    delete iContainer;    
     
     DPRINT << ": OUT";
 }
@@ -247,5 +262,163 @@
     return simState == ESimUsable && err == KErrNone;
 }
 
+/*!
+    CNetworkListener::AllowRefresh
+ */
+TBool CNetworkListener::AllowRefresh(
+                const TSatRefreshType aType,
+                const TSatElementaryFiles aFiles )
+{
+    DPRINT << "aType: " << aType;
+    DPRINT << "aFiles: " << aFiles;
+    
+    TBool allowRefresh = ETrue;
+    if ( iSettingsEngine->IsCallActive() == CPsetSAObserver::EPSetCallActive )
+        {
+        allowRefresh = EFalse;
+        }
+
+    DPRINT << ": OUT allowRefresh " << allowRefresh;
+    
+    return allowRefresh;
+}
+
+/*!
+    CNetworkListener::Refresh
+ */
+void CNetworkListener::Refresh(
+                const TSatRefreshType aType,
+                const TSatElementaryFiles aFiles )
+{
+    DPRINT << ": IN";
+    
+    if ((aType != EFileChangeNotification) ||
+        ((aType == EFileChangeNotification) &&
+        (aFiles & KCsp1Ef)))
+        {
+        MPsetNetworkSelect::TSelectMode mode;
+        iSettingsEngine->GetNetworkSelectMode(mode);
+        DPRINT << "mode " << mode;
+        if (mode == MPsetNetworkSelect::ENetSelectModeManual) {
+            TPSetChangedCspSetting changedCspSettings;
+            TPSetChangedCspSetting newValues;
+            TInt err = iRefreshHandler->ChangedCspSettings(changedCspSettings, newValues);
+            if ((changedCspSettings & EPSetNetSelSup) && 
+                !(newValues & EPSetNetSelSup) &&
+                (err == KErrNone)) {
+                DPRINT << "Network selection not supported ";
+                // Network selection mode can't change during SIM refresh,
+                // start 1 second timer.
+                iTimer->Cancel();
+                iTimer->Start(KSimRefreshAsynronationTimeout,
+                              KSimRefreshAsynronationTimeout,
+                              TCallBack( NWSimRefreshCallBack, this ));
+            }
+        }
+    }
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    CNetworkListener::HandleNetworkInfoReceivedL
+ */
+void CNetworkListener::HandleNetworkInfoReceivedL( 
+        const CNetworkInfoArray* /*aInfoArray*/, const TInt /*aResult*/ )
+{
+    DPRINT;
+}
+
+/*!
+    CNetworkListener::HandleCurrentNetworkInfoL
+ */
+void CNetworkListener::HandleCurrentNetworkInfoL( 
+        const MPsetNetworkSelect::TCurrentNetworkInfo& /*aCurrentInfo*/, 
+        const TInt /*aResult*/ )
+{
+    DPRINT;
+}
+
+/*!
+    CNetworkListener::HandleNetworkChangedL
+ */
+void CNetworkListener::HandleNetworkChangedL( 
+        const MPsetNetworkSelect::TNetworkInfo& /*aCurrentInfo*/,
+        const MPsetNetworkSelect::TCurrentNetworkStatus /*aStatus*/, 
+        const TInt /*aResult*/ )
+{
+    /**
+    *  DEPRECATED.
+    */
+}
+
+/*!
+    CNetworkListener::HandleNetworkChangedL
+ */
+void CNetworkListener::HandleNetworkChangedL( 
+        const MPsetNetworkSelect::TNetworkInfo& /*aCurrentInfo*/,
+        const RMobilePhone::TMobilePhoneRegistrationStatus& /*aStatus*/, 
+        const TInt /*aResult*/ )
+{
+    DPRINT;
+}
+
+/*!
+    CNetworkListener::HandleSearchingNetworksL
+ */
+void CNetworkListener::HandleSearchingNetworksL( TServiceRequest /*aRequest*/ )
+{
+    DPRINT;
+}
+
+/*!
+    CNetworkListener::HandleRequestingSelectedNetworkL
+ */
+void CNetworkListener::HandleRequestingSelectedNetworkL( TBool /*aOngoing*/ )
+{
+    DPRINT; 
+}
+
+/*!
+    CNetworkListener::HandleCallActivatedL
+ */
+void CNetworkListener::HandleCallActivatedL()
+{
+    DPRINT;
+}
+
+/*!
+    CNetworkListener::HandleNetworkErrorL
+ */
+void CNetworkListener::HandleNetworkErrorL( 
+        const MPsetNetworkInfoObserver::TServiceRequest /*aRequest*/,
+        const TInt /*aError*/ )
+{
+    DPRINT;
+}
+
+/*!
+    CNetworkListener::NWSimRefreshCallBack.
+ */
+TInt CNetworkListener::NWSimRefreshCallBack(TAny* aParam)
+{
+    DPRINT << ": IN";
+    
+    CNetworkListener* self = 
+        reinterpret_cast< CNetworkListener* >( aParam );
+    
+    if ( self ) {
+        self->iTimer->Cancel();
+        //Change the network mode to Automatic.
+        MPsetNetworkSelect::TNetworkInfo info;
+        info.iMode = MPsetNetworkSelect::ENetSelectModeAutomatic;
+        DPRINT << ": set network mode to automatic";
+        TRAP_IGNORE(self->iSettingsEngine->SelectNetworkL(info));
+    }
+    
+    DPRINT << ": OUT";
+    return KErrNone;
+}
+
 // End of file
     
--- a/phoneengine/networkhandlingstarter/src/networkhandlingstarter.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/src/networkhandlingstarter.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -14,6 +14,8 @@
  * Description:  
  *
  */
+
+#include <tstasksettings.h>
 #include <networkhandlingstarter.h>
 #include <networkhandlingstarterlogging.h>
 #include <networkhandlingstarter_p.h>
@@ -51,6 +53,10 @@
     if(!m_privateImpl) {
         m_privateImpl = new NetworkHandlingStarterPrivate();
     }
+
+    // Networkhandlingstarter to be invisible in taskswitcher 
+    TsTaskSettings taskSettings;
+    taskSettings.setVisibility(false);
 }
 
 // End of File.
--- a/phoneengine/networkhandlingstarter/tsrc/mocks/mock_cnetworklistener.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_cnetworklistener.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -1,8 +1,7 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+/** 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"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -105,3 +104,141 @@
     }
 
 
+// -----------------------------------------------------------------------------
+// CNetworkListener::NWSimRefreshCallBack
+// -----------------------------------------------------------------------------
+//
+TInt CNetworkListener::NWSimRefreshCallBack( 
+        TAny * aParam )
+    {
+    //SMC_MOCK_METHOD1( TInt, TAny *, aParam )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::AllowRefresh
+// -----------------------------------------------------------------------------
+//
+TBool CNetworkListener::AllowRefresh( 
+        const TSatRefreshType aType,
+        const TSatElementaryFiles aFiles )
+    {
+    SMC_MOCK_METHOD2( TBool, const TSatRefreshType, aType, 
+        const TSatElementaryFiles, aFiles )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::Refresh
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::Refresh( 
+        const TSatRefreshType aType,
+        const TSatElementaryFiles aFiles )
+    {
+    SMC_MOCK_METHOD2( void, const TSatRefreshType, aType, 
+        const TSatElementaryFiles, aFiles )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleNetworkInfoReceivedL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleNetworkInfoReceivedL( 
+        const CNetworkInfoArray * aInfoArray,
+        const TInt aResult )
+    {
+    SMC_MOCK_METHOD2( void, const CNetworkInfoArray *, aInfoArray, 
+        const TInt, aResult )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleCurrentNetworkInfoL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleCurrentNetworkInfoL( 
+        const MPsetNetworkSelect::TCurrentNetworkInfo & aCurrentInfo,
+        const TInt aResult )
+    {
+    SMC_MOCK_METHOD2( void, const MPsetNetworkSelect::TCurrentNetworkInfo &, aCurrentInfo, 
+        const TInt, aResult )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleNetworkChangedL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleNetworkChangedL( 
+        const MPsetNetworkSelect::TNetworkInfo & aCurrentInfo,
+        const MPsetNetworkSelect::TCurrentNetworkStatus aStatus,
+        const TInt aResult )
+    {
+    SMC_MOCK_METHOD3( void, const MPsetNetworkSelect::TNetworkInfo &, aCurrentInfo, 
+        const MPsetNetworkSelect::TCurrentNetworkStatus, aStatus, 
+        const TInt, aResult )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleNetworkChangedL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleNetworkChangedL( 
+        const MPsetNetworkSelect::TNetworkInfo & aCurrentInfo,
+        const RMobilePhone::TMobilePhoneRegistrationStatus & aStatus,
+        const TInt aResult )
+    {
+    SMC_MOCK_METHOD3( void, const MPsetNetworkSelect::TNetworkInfo &, aCurrentInfo, 
+        const RMobilePhone::TMobilePhoneRegistrationStatus &, aStatus, 
+        const TInt, aResult )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleSearchingNetworksL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleSearchingNetworksL( 
+        TServiceRequest aRequest )
+    {
+    SMC_MOCK_METHOD1( void, TServiceRequest, aRequest )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleRequestingSelectedNetworkL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleRequestingSelectedNetworkL( 
+        TBool aOngoing )
+    {
+    SMC_MOCK_METHOD1( void, TBool, aOngoing )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleCallActivatedL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleCallActivatedL(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNetworkListener::HandleNetworkErrorL
+// -----------------------------------------------------------------------------
+//
+void CNetworkListener::HandleNetworkErrorL( 
+        const MPsetNetworkInfoObserver::TServiceRequest aRequest,
+        const TInt aError )
+    {
+    SMC_MOCK_METHOD2( void, const MPsetNetworkInfoObserver::TServiceRequest, aRequest, 
+        const TInt, aError )
+    }
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_cpsetrefreshhandler.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -0,0 +1,81 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <mock_cpsetrefreshhandler.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CPSetRefreshHandlerMock::NewL
+// -----------------------------------------------------------------------------
+//
+CPSetRefreshHandlerMock * CPSetRefreshHandlerMock::NewL(  )
+    {
+    SMC_MOCK_NEWL0( CPSetRefreshHandlerMock * )
+
+    CPSetRefreshHandlerMock* self = new( ELeave ) CPSetRefreshHandlerMock;
+    CleanupStack::PushL( self );
+    //self->ConstructL()
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPSetRefreshHandlerMock::NotifyFileChangeL
+// -----------------------------------------------------------------------------
+//
+void CPSetRefreshHandlerMock::NotifyFileChangeL( 
+        MSSSettingsRefreshObserver & aObserver,
+        TSatElementaryFiles aObservedFile,
+        TSatRefreshType aObservedRefreshType )
+    {
+    SMC_MOCK_METHOD3( void, MSSSettingsRefreshObserver &, aObserver, 
+        TSatElementaryFiles, aObservedFile, 
+        TSatRefreshType, aObservedRefreshType )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPSetRefreshHandlerMock::CancelNotify
+// -----------------------------------------------------------------------------
+//
+void CPSetRefreshHandlerMock::CancelNotify(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPSetRefreshHandlerMock::ChangedCspSettings
+// -----------------------------------------------------------------------------
+//
+TInt CPSetRefreshHandlerMock::ChangedCspSettings( 
+        TPSetChangedCspSetting & aChangedCspSettings,
+        TPSetChangedCspSetting & aNewValues )
+    {
+    SMC_MOCK_METHOD2( TInt, TPSetChangedCspSetting &, aChangedCspSettings, 
+        TPSetChangedCspSetting &, aNewValues )
+    }
+// -----------------------------------------------------------------------------
+// CPSetRefreshHandlerMock::ChangedCspSettings
+// -----------------------------------------------------------------------------
+//
+CPSetRefreshHandlerMock::~CPSetRefreshHandlerMock()
+    {
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_cpsetrefreshhandler.h	Thu Sep 02 20:26:16 2010 +0300
@@ -0,0 +1,32 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies 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 CPSetRefreshHandler_h
+#define CPSetRefreshHandler_h
+
+
+#include <psetrefreshhandler.h> 
+   
+class CPSetRefreshHandlerMock : public CPSetRefreshHandler
+    {
+    public:
+        ~CPSetRefreshHandlerMock();
+        static CPSetRefreshHandlerMock* NewL();
+        void NotifyFileChangeL( MSSSettingsRefreshObserver & aObserver, TSatElementaryFiles aObservedFile, TSatRefreshType aObservedRefreshType );
+        void CancelNotify( );
+        TInt ChangedCspSettings( TPSetChangedCspSetting & aChangedCspSettings, TPSetChangedCspSetting & aNewValues );
+    };
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_psetcontainer.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -0,0 +1,135 @@
+/*
+* 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 <smcmockclassincludes.h>
+#include <mmtsy_names.h>
+#include <mpsetdivertobs.h>
+#include "PsetContainer.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::ConstructL
+// -----------------------------------------------------------------------------
+//
+void CPsetContainer::ConstructL(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::NewL
+// -----------------------------------------------------------------------------
+//
+CPsetContainer * CPsetContainer::NewL(  )
+    {
+    SMC_MOCK_NEWL0( CPsetContainer * )
+
+    CPsetContainer* self = new( ELeave ) CPsetContainer;
+    CleanupStack::PushL( self );
+    //self->ConstructL()
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::~CPsetContainer
+// -----------------------------------------------------------------------------
+//
+CPsetContainer::~CPsetContainer(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::CreateCWObjectL
+// -----------------------------------------------------------------------------
+//
+CPsetCallWaiting * CPsetContainer::CreateCWObjectL( 
+        MPsetCallWaitingObserver & aObserver )
+    {
+    SMC_MOCK_METHOD1( CPsetCallWaiting *, MPsetCallWaitingObserver &, aObserver )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::CreateCFObjectL
+// -----------------------------------------------------------------------------
+//
+CPsetCallDiverting * CPsetContainer::CreateCFObjectL( 
+        MPsetDivertObserver & aObserver )
+    {
+    SMC_MOCK_METHOD1( CPsetCallDiverting *, MPsetDivertObserver &, aObserver )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::CreateCliObjectL
+// -----------------------------------------------------------------------------
+//
+CPsetCli * CPsetContainer::CreateCliObjectL( 
+        MPsetCliObserver & aObserver )
+    {
+    SMC_MOCK_METHOD1( CPsetCli *, MPsetCliObserver &, aObserver )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::CreateCBObjectL
+// -----------------------------------------------------------------------------
+//
+CPsetCallBarring * CPsetContainer::CreateCBObjectL( 
+        MPsetBarringObserver & aObserver )
+    {
+    SMC_MOCK_METHOD1( CPsetCallBarring *, MPsetBarringObserver &, aObserver )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::CreateNetworkObjectL
+// -----------------------------------------------------------------------------
+//
+CPsetNetwork * CPsetContainer::CreateNetworkObjectL( 
+        MPsetNetworkInfoObserver & aObserver )
+    {
+    SMC_MOCK_METHOD1( CPsetNetwork *, MPsetNetworkInfoObserver &, aObserver )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::CreateRefreshHandlerL
+// -----------------------------------------------------------------------------
+//
+CPSetRefreshHandler * CPsetContainer::CreateRefreshHandlerL(  )
+    {
+    SMC_MOCK_METHOD0( CPSetRefreshHandler * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetContainer::CreateNetworkModeObjectL
+// -----------------------------------------------------------------------------
+//
+CPsetNetwork * CPsetContainer::CreateNetworkModeObjectL( 
+        MPsetNetworkModeObserver & aModeObserver )
+    {
+    SMC_MOCK_METHOD1( CPsetNetwork *, MPsetNetworkModeObserver &, aModeObserver )
+    }
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_psetnetwork.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -0,0 +1,246 @@
+/*
+* 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 <etelmm.h>
+#include <mmretrieve.h>
+#include <RmmCustomApi.h>
+
+#include <e32svr.h>
+#include <smcmockclassincludes.h>
+#include <PsetNetwork.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::CPsetNetwork
+// -----------------------------------------------------------------------------
+//
+CPsetNetwork::CPsetNetwork( 
+        RMobilePhone & aPhone )
+    :
+    CActive(EPriorityStandard),
+    iPhone(aPhone)
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::ConstructL
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::ConstructL( 
+        MPsetNetworkInfoObserver & /*aObserver*/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::NewL
+// -----------------------------------------------------------------------------
+//
+CPsetNetwork * CPsetNetwork::NewL( 
+        RMobilePhone & aPhone,
+        MPsetNetworkInfoObserver & aObserver )
+    {
+    SMC_MOCK_NEWL2( CPsetNetwork *, RMobilePhone &, aPhone, 
+        MPsetNetworkInfoObserver &, aObserver )
+
+    CPsetNetwork* self = new ( ELeave ) CPsetNetwork( aPhone );
+    CleanupStack::PushL( self );
+    //self->ConstructL()
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::NewL
+// -----------------------------------------------------------------------------
+//
+CPsetNetwork * CPsetNetwork::NewL( 
+        RMobilePhone & aPhone,
+        MPsetNetworkModeObserver & aObserver )
+    {
+    SMC_MOCK_NEWL2( CPsetNetwork *, RMobilePhone &, aPhone, 
+        MPsetNetworkModeObserver &, aObserver )
+
+    CPsetNetwork* self = new ( ELeave ) CPsetNetwork( aPhone );
+    CleanupStack::PushL( self );
+    //self->ConstructL()
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::~CPsetNetwork
+// -----------------------------------------------------------------------------
+//
+CPsetNetwork::~CPsetNetwork(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::GetAvailableNetworksL
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::GetAvailableNetworksL(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::GetCurrentNetworkInfo
+// -----------------------------------------------------------------------------
+//
+TInt CPsetNetwork::GetCurrentNetworkInfo( 
+        TCurrentNetworkInfo & aInfo )
+    {
+    SMC_MOCK_METHOD1( TInt, TCurrentNetworkInfo &, aInfo )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::GetNetworkSelectMode
+// -----------------------------------------------------------------------------
+//
+TInt CPsetNetwork::GetNetworkSelectMode( 
+        TSelectMode & aMode )
+    {
+    SMC_MOCK_METHOD1( TInt, TSelectMode &, aMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::SelectNetworkL
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::SelectNetworkL( 
+        const TNetworkInfo & aInfo )
+    {
+    SMC_MOCK_METHOD1( void, const TNetworkInfo &, aInfo )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::CancelProcess
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::CancelProcess(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::SetNetworkModeSelectionL
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::SetNetworkModeSelectionL( 
+        TUint32 & aNetworkMode )
+    {
+    // Reference parameter is not really used to return some value so do not 
+    // save it as a reference to the symbianmock, because test will fail
+    // if stack-based parameter is saved as a reference.
+    SMC_MOCK_METHOD1( void, TUint32/* &*/, aNetworkMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::GetCurrentNetworkModeSelectionL
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::GetCurrentNetworkModeSelectionL(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::IsCallActive
+// -----------------------------------------------------------------------------
+//
+TInt CPsetNetwork::IsCallActive(  )
+    {
+    SMC_MOCK_METHOD0( TInt )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::IsGPRSConnected
+// -----------------------------------------------------------------------------
+//
+TInt CPsetNetwork::IsGPRSConnected(  )
+    {
+    SMC_MOCK_METHOD0( TInt )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::ResetNetworkSearch
+// -----------------------------------------------------------------------------
+//
+TInt CPsetNetwork::ResetNetworkSearch(  )
+    {
+    SMC_MOCK_METHOD0( TInt )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::SetNetSAObserver
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::SetNetSAObserver( 
+        MPsetNetworkInfoObserver & aObserver )
+    {
+    SMC_MOCK_METHOD1( void, MPsetNetworkInfoObserver &, aObserver )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::SetNetworkModeObserver
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::SetNetworkModeObserver( 
+        MPsetNetworkModeObserver & aObserver )
+    {
+    SMC_MOCK_METHOD1( void, MPsetNetworkModeObserver &, aObserver )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::DoCancel
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::DoCancel()
+    {
+        
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPsetNetwork::RunL
+// -----------------------------------------------------------------------------
+//
+void CPsetNetwork::RunL()
+    {
+        
+    }
--- a/phoneengine/networkhandlingstarter/tsrc/mocks/mock_qsysteminfo.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_qsysteminfo.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -240,6 +240,26 @@
 
 
 // -----------------------------------------------------------------------------
+// QSystemDeviceInfo::connectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemDeviceInfo::connectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::disconnectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemDeviceInfo::disconnectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
 // QSystemInfo::QSystemInfo
 // -----------------------------------------------------------------------------
 //
@@ -315,6 +335,26 @@
 
 
 // -----------------------------------------------------------------------------
+// QSystemInfo::connectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemInfo::connectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::disconnectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemInfo::disconnectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
 // QSystemNetworkInfo::QSystemNetworkInfo
 // -----------------------------------------------------------------------------
 //
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_tstasksettings.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -0,0 +1,72 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "tstasksettings.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// TsTaskSettings::TsTaskSettings
+// -----------------------------------------------------------------------------
+//
+TsTaskSettings::TsTaskSettings(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// TsTaskSettings::~TsTaskSettings
+// -----------------------------------------------------------------------------
+//
+TsTaskSettings::~TsTaskSettings(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// TsTaskSettings::registerScreenshot
+// -----------------------------------------------------------------------------
+//
+bool TsTaskSettings::registerScreenshot( 
+        const QPixmap & screenshot )
+    {
+    SMC_MOCK_METHOD1( bool, const QPixmap &, screenshot )
+    }
+
+
+// -----------------------------------------------------------------------------
+// TsTaskSettings::unregisterScreenshot
+// -----------------------------------------------------------------------------
+//
+bool TsTaskSettings::unregisterScreenshot(  )
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// TsTaskSettings::setVisibility
+// -----------------------------------------------------------------------------
+//
+bool TsTaskSettings::setVisibility( bool Visibility )
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
--- a/phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqaiwrequest.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqaiwrequest.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -287,16 +287,32 @@
     SMC_MOCK_METHOD0( bool )
     }
 
-const QMetaObject *XQAiwRequest::metaObject() const
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::handleAsyncResponse
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::handleAsyncResponse(const QVariant& value)
 {
-    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : NULL;
+    SMC_MOCK_METHOD1( void, const QVariant &, value )
 }
 
-void *XQAiwRequest::qt_metacast(const char *_clname)
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::sendFromAction
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::sendFromAction(bool checked)
 {
+    SMC_MOCK_METHOD1( void, bool, checked )
 }
 
-int XQAiwRequest::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::handleAsyncError
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::handleAsyncError(int err)
 {
-    return 0;
+    SMC_MOCK_METHOD1( void, int, err )
 }
--- a/phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqappmgr.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqappmgr.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -295,17 +295,3 @@
     {
    // SMC_MOCK_METHOD1( XQApplicationManager::ServiceStatus, const XQAiwInterfaceDescriptor &, implementation )
     }
-
-const QMetaObject *XQApplicationManager::metaObject() const
-{
-    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : NULL;
-}
-
-void *XQApplicationManager::qt_metacast(const char *_clname)
-{
-}
-
-int XQApplicationManager::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
-{
-    return 0;
-}
--- a/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/inc/ut_cnetworklistener.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/inc/ut_cnetworklistener.h	Thu Sep 02 20:26:16 2010 +0300
@@ -21,8 +21,11 @@
 #include <QtTest/QtTest>
 #include <mockservice.h>
 #include <mnetworklistenerobserver.h>
+#include <mock_cpsetrefreshhandler.h>
 
 class CNetworkListener;
+class CPSetRefreshHandler;
+class CPsetNetwork;
 
 class ut_cnetworklistener : public QObject, public MockService, public MNetworkListenerObserver
 {
@@ -46,11 +49,24 @@
     void t_HandleNetworkMessage();
     void t_HandleNetworkError();
     void t_NWLostDelayCallBack();
-
+    void t_NWSimRefreshCallBack();
+    void t_AllowRefresh();
+    void t_Refresh();
+    void t_HandleNetworkInfoReceivedL();
+    void t_HandleCurrentNetworkInfoL();
+    void t_HandleNetworkChangedL_1();
+    void t_HandleNetworkChangedL_2();
+    void t_HandleSearchingNetworksL();
+    void t_HandleRequestingSelectedNetworkL();
+    void t_HandleCallActivatedL();
+    void t_HandleNetworkErrorL();
     
 private:
     
     CNetworkListener *m_networkListener;
+    CPSetRefreshHandler *m_refreshHandler;
+    CPsetNetwork* m_settingsEngine;
+    
 
 };
 
--- a/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/src/ut_cnetworklistener.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/src/ut_cnetworklistener.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -20,6 +20,8 @@
 #include <networkhandlingproxy.h>
 #include <cnwsession.h>
 #include <nwhandlingengine.h>
+#include <mock_cpsetrefreshhandler.h>
+#include <psetnetwork.h> 
 
 TNWInfo* PoiterNWInfo;
 
@@ -32,6 +34,25 @@
     return nullPointer;
 }
 
+TPSetChangedCspSetting g_changedCspSettings;
+TPSetChangedCspSetting g_newValues;
+
+
+void ChangedCspSettings( 
+        TPSetChangedCspSetting & aChangedCspSettings,
+        TPSetChangedCspSetting & aNewValues )
+{
+    aChangedCspSettings = g_changedCspSettings;
+    aNewValues = g_newValues;
+}
+
+MPsetNetworkSelect::TSelectMode g_mode;
+void GetNetworkSelectMode( 
+        MPsetNetworkSelect::TSelectMode & aMode )
+{
+    aMode = g_mode;
+}
+
 /*!
   ut_cnetworklistener::ut_cnetworklistener
  */
@@ -55,6 +76,12 @@
 {
     initialize();
     
+    m_refreshHandler = CPSetRefreshHandlerMock::NewL();
+    QT_TRAP_THROWING(SmcDefaultValue<CPSetRefreshHandler *>::SetL(m_refreshHandler));
+    RMobilePhone *phone(NULL); 
+    MPsetNetworkInfoObserver *observer(NULL);
+    m_settingsEngine = CPsetNetwork::NewL(*phone, *observer);
+    QT_TRAP_THROWING(SmcDefaultValue<CPsetNetwork *>::SetL(m_settingsEngine));
     m_networkListener = CNetworkListener::NewL(*this);
     
     QT_TRAP_THROWING(SmcDefaultValue<QSystemDeviceInfo::Profile>::SetL(
@@ -69,7 +96,15 @@
 void ut_cnetworklistener::cleanup()
 {
     delete m_networkListener;
-    m_networkListener = 0;
+    m_networkListener = NULL;
+    
+    SmcDefaultValue<CPSetRefreshHandler *>::Reset();
+    // CNetworkListener delete m_refreshHandler object
+    m_refreshHandler = NULL;
+    
+    SmcDefaultValue<CPsetNetwork *>::Reset();
+    // CNetworkListener delete m_settingsEngine object
+    m_settingsEngine = NULL;
     
     SmcDefaultValue<QSystemDeviceInfo::Profile>::Reset();
     
@@ -146,9 +181,133 @@
     TAny* pointer(NULL); 
     m_networkListener->NWLostDelayCallBack(pointer);
     
-    CNetworkListener* networklistener = CNetworkListener::NewL(*this);
-    m_networkListener->NWLostDelayCallBack( networklistener );
-    delete networklistener;
+    m_networkListener->NWLostDelayCallBack(m_networkListener);
+}
+
+/*!
+  ut_cnetworklistener::t_NWSimRefreshCallBack
+ */
+void ut_cnetworklistener::t_NWSimRefreshCallBack()
+{
+    TAny* pointer(NULL); 
+    m_networkListener->NWSimRefreshCallBack(pointer);
+    
+    m_networkListener->NWSimRefreshCallBack(m_networkListener);
+}
+
+/*!
+  ut_cnetworklistener::t_AllowRefresh
+ */
+void ut_cnetworklistener::t_AllowRefresh()
+{
+    TSatRefreshType type;
+    TSatElementaryFiles files;
+    m_networkListener->AllowRefresh(type, files);
+}
+
+/*!
+  ut_cnetworklistener::t_Refresh
+ */
+void ut_cnetworklistener::t_Refresh()
+{
+    TSatRefreshType type(ESimInitFileChangeNotification);
+    TSatElementaryFiles files;
+    g_mode = MPsetNetworkSelect::ENetSelectModeManual;
+    g_changedCspSettings = EPSetNetSelSup;
+    g_newValues = EPSetALS;
+    expect("CPsetNetwork::GetNetworkSelectMode").willOnce(invoke(GetNetworkSelectMode)).returns(KErrNone);
+    expect("CPSetRefreshHandlerMock::ChangedCspSettings").willOnce(invoke(ChangedCspSettings)).returns(KErrNone);
+    m_networkListener->Refresh(type, files);
+    QVERIFY(verify());
+    
+    g_newValues = EPSetNetSelSup;
+    expect("CPsetNetwork::GetNetworkSelectMode").willOnce(invoke(GetNetworkSelectMode)).returns(KErrNone);
+    expect("CPSetRefreshHandlerMock::ChangedCspSettings").willOnce(invoke(ChangedCspSettings)).returns(KErrNone);
+    m_networkListener->Refresh(type, files);
+    QVERIFY(verify());
+    
+    g_mode = MPsetNetworkSelect::ENetSelectModeAutomatic;
+    expect("CPsetNetwork::GetNetworkSelectMode").willOnce(invoke(GetNetworkSelectMode)).returns(KErrNone);
+    m_networkListener->Refresh(type, files);
+    QVERIFY(verify());
+}
+
+/*!
+  ut_cnetworklistener::t_HandleNetworkInfoReceivedL
+ */
+void ut_cnetworklistener::t_HandleNetworkInfoReceivedL()
+{
+    CNetworkInfoArray* infoArray;
+    TInt result;
+    m_networkListener->HandleNetworkInfoReceivedL(infoArray, result);
+}
+
+/*!
+  ut_cnetworklistener::t_HandleCurrentNetworkInfoL
+ */
+void ut_cnetworklistener::t_HandleCurrentNetworkInfoL()
+{
+    MPsetNetworkSelect::TCurrentNetworkInfo currentInfo;
+    TInt result;
+    m_networkListener->HandleCurrentNetworkInfoL(currentInfo, result);
+}
+
+/*!
+  ut_cnetworklistener::t_HandleNetworkChangedL
+ */
+void ut_cnetworklistener::t_HandleNetworkChangedL_1()
+{
+    MPsetNetworkSelect::TNetworkInfo currentInfo;
+    MPsetNetworkSelect::TCurrentNetworkStatus status;
+    TInt result;
+    m_networkListener->HandleNetworkChangedL(currentInfo, status, result);
+}
+
+/*!
+  ut_cnetworklistener::t_HandleNetworkChangedL
+ */
+void ut_cnetworklistener::t_HandleNetworkChangedL_2()
+{
+    MPsetNetworkSelect::TNetworkInfo currentInfo;
+    RMobilePhone::TMobilePhoneRegistrationStatus status;
+    TInt result;
+    m_networkListener->HandleNetworkChangedL(currentInfo, status, result);
+}
+
+/*!
+  ut_cnetworklistener::t_HandleSearchingNetworksL
+ */
+void ut_cnetworklistener::t_HandleSearchingNetworksL()
+{
+    MPsetNetworkInfoObserver::TServiceRequest request;
+    m_networkListener->HandleSearchingNetworksL(request);
+}
+
+/*!
+  ut_cnetworklistener::t_HandleRequestingSelectedNetworkL
+ */
+void ut_cnetworklistener::t_HandleRequestingSelectedNetworkL()
+{
+    TBool ongoing;
+    m_networkListener->HandleRequestingSelectedNetworkL(ongoing);
+}
+
+/*!
+  ut_cnetworklistener::t_HandleCallActivatedL
+ */
+void ut_cnetworklistener::t_HandleCallActivatedL()
+{
+    m_networkListener->HandleCallActivatedL();
+}
+
+/*!
+  ut_cnetworklistener::t_HandleNetworkErrorL
+ */
+void ut_cnetworklistener::t_HandleNetworkErrorL()
+{
+    MPsetNetworkInfoObserver::TServiceRequest request;
+    TInt error;
+    m_networkListener->HandleNetworkErrorL(request, error);
 }
 
 QTEST_MAIN_S60(ut_cnetworklistener)
--- a/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/ut_cnetworklistener.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/ut_cnetworklistener.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -32,8 +32,12 @@
 symbian: {
   CONFIG += no_icon
   INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
   LIBS += -lmocklib \
-          -lsymbianmock
+          -lsymbianmock \
+          -letel \
+          -letelmm \
+          -lcustomapi
 }
 
 # test code
@@ -49,3 +53,7 @@
 SOURCES += ../mocks/mock_cnwsession.cpp
 SOURCES += ../mocks/mock_centralrepository.cpp
 SOURCES += ../mocks/mock_qsysteminfo.cpp
+SOURCES += ../mocks/mock_psetcontainer.cpp
+SOURCES += ../mocks/mock_cpsetrefreshhandler.cpp
+HEADERS += ../mocks/mock_cpsetrefreshhandler.h
+SOURCES += ../mocks/mock_psetnetwork.cpp
--- a/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter/ut_networkhandlingstarter.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter/ut_networkhandlingstarter.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -45,6 +45,7 @@
 
 # mocks needed for testing
 HEADERS += ../../inc/networkhandlingstarter_p.h
-SOURCES += ../mocks/mock_networkhandlingstarter_p.cpp
+SOURCES += ../mocks/mock_networkhandlingstarter_p.cpp \
+           ../mocks/mock_tstasksettings.cpp
 
 
--- a/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/ut_networkhandlingstarter_p.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/ut_networkhandlingstarter_p.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -23,6 +23,7 @@
 INCLUDEPATH += ../../inc
 INCLUDEPATH += ../common
 DEFINES += QT_NO_DEBUG_STREAM BUILD_NETWORKHANDLINGSTARTER
+DEFINES += XQ_BUILD_XQSERVICE_LIB
 
 QT -= gui
 QT += testlib
@@ -52,7 +53,8 @@
 SOURCES += ../mocks/mock_qgraphicsview.cpp
 SOURCES += ../mocks/mock_qabstractscrollarea.cpp
 SOURCES += ../mocks/mock_qframe.cpp
+HEADERS += /epoc32/include/mw/xqappmgr.h
 SOURCES += ../mocks/mock_xqappmgr.cpp
+HEADERS += /epoc32/include/mw/xqaiwrequest.h
 SOURCES += ../mocks/mock_xqaiwrequest.cpp
 SOURCES += ../mocks/mock_hbtranslator.cpp
-
--- a/phoneengine/phonemodel/inc/cpeexternaldatahandler.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/phonemodel/inc/cpeexternaldatahandler.h	Thu Sep 02 20:26:16 2010 +0300
@@ -26,12 +26,12 @@
 #include "cpeprofilesettingmonitor.h"
 #include "mpeexternaldatahandler.h"
 #include "cpeaccessorymodemonitor.h"
-#include "penetworkhandler.h"
 #include <e32base.h>
 
 // FORWARD DECLARATIONS
 class MPEDataStore;
 class MPEPhoneModelInternal;
+class PeNetworkHandler;
 
 // DATA TYPES
 // None
--- a/phoneengine/phonemodel/inc/cpeparsersshandler.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/phonemodel/inc/cpeparsersshandler.h	Thu Sep 02 20:26:16 2010 +0300
@@ -239,22 +239,22 @@
         /**
         * Create call barring observer
         */
-        void CPEParserSSHandler::CreateCBObsL();
+        void CreateCBObsL();
     
         /**
         * Create call cli observer
         */
-        void CPEParserSSHandler::CreateCliObsL();          
+        void CreateCliObsL();          
         
         /**
         * Create call divert observer
         */
-        void CPEParserSSHandler::CreateCFObsL();
+        void CreateCFObsL();
 
         /**
         * Create call waiting observer
         */
-        void CPEParserSSHandler::CreateCWObsL();
+        void CreateCWObsL();
 
         /**
         * if ConnectSsToEngine leaves, this is called
--- a/phoneengine/phonemodel/phonemodel.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/phonemodel/phonemodel.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -179,7 +179,6 @@
 BLD_INF_RULES.prj_exports += \
  "$${LITERAL_HASH}include <platform_paths.hrh>" \
  "./rom/phonengengine.iby    CORE_APP_LAYER_IBY_EXPORT_PATH(phonengengine.iby)"
-BLD_INF_RULES.prj_exports += "./conf/ci_s60telephony.confml APP_LAYER_CONFML(ci_s60telephony.confml)"
 BLD_INF_RULES.prj_exports += "./conf/s60telephony.confml APP_LAYER_CONFML(s60telephony.confml)"
 BLD_INF_RULES.prj_exports += "./conf/s60telephony_japan.confml CONFML_EXPORT_PATH(s60telephony_japan.confml,japan)"
 BLD_INF_RULES.prj_exports += "./conf/s60telephony_101f87e3.crml APP_LAYER_CRML(s60telephony_101f87e3.crml)"
--- a/phoneengine/phonemodel/src/cpeexternaldatahandler.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/phonemodel/src/cpeexternaldatahandler.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -18,6 +18,7 @@
 
 
 // INCLUDE FILES
+#include "penetworkhandler.h"
 #include "cpeexternaldatahandler.h"
 #include "mpephonemodelinternal.h"
 #include <accessoriescrkeys.h>
--- a/phoneengine/phoneservices/tsrc/ut_phoneservices/unit_tests.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_phoneservices/unit_tests.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -19,6 +19,8 @@
 #include "phoneservices.h"
 #include "dialservice.h"
 #include "dtmfservice.h"
+#include "dialservicedepricated.h"
+#include "dtmfservicedepricated.h"
 #include "urischemehandlerservice.h"
 
 bool g_dialServiceConstructed;
@@ -104,35 +106,35 @@
     return 0;
 }
 
-void DialService::dialVideo(const QString& number)
+int DialService::dialVideo(const QString& number)
 {
     Q_UNUSED(number)
 }
 
-void DialService::dialVideo(const QString& number, int contactId)
+int DialService::dialVideo(const QString& number, int contactId)
 {
     Q_UNUSED(number)
     Q_UNUSED(contactId)
 }
 
-void DialService::dialVoip(const QString& address)
+int DialService::dialVoip(const QString& address)
 {
     Q_UNUSED(address)
 }
 
-void DialService::dialVoip(const QString& address, int contactId)
+int DialService::dialVoip(const QString& address, int contactId)
 {
     Q_UNUSED(address)
     Q_UNUSED(contactId)
 }
 
-void DialService::dialVoipService(const QString& address, int serviceId)
+int DialService::dialVoipService(const QString& address, int serviceId)
 {
     Q_UNUSED(address)
     Q_UNUSED(serviceId)
 }
 
-void DialService::dialVoipService(
+int DialService::dialVoipService(
         const QString& address, int serviceId, int contactId)
 {
     Q_UNUSED(address)
@@ -140,6 +142,78 @@
     Q_UNUSED(contactId)
 }
 
+DialServiceDepricated::DialServiceDepricated(MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent) : 
+    XQServiceProvider(QLatin1String("com.nokia.symbian.ICallDial"), parent), m_call (call), m_parameters (parameters)
+{
+}
+
+DialServiceDepricated::~DialServiceDepricated()
+{
+}
+
+int DialServiceDepricated::dial(const QString& number)
+{
+    Q_UNUSED(number)
+}
+
+int DialServiceDepricated::dial(const QString& number, int contactId)
+{
+    Q_UNUSED(number)
+    Q_UNUSED(contactId)
+}
+
+void DialServiceDepricated::dialVideo(const QString& number)
+{
+    Q_UNUSED(number)
+}
+
+void DialServiceDepricated::dialVideo(const QString& number, int contactId)
+{
+    Q_UNUSED(number)
+    Q_UNUSED(contactId)
+}
+
+void DialServiceDepricated::dialVoip(const QString& address)
+{
+    Q_UNUSED(address)
+}
+
+void DialServiceDepricated::dialVoip(const QString& address, int contactId)
+{
+    Q_UNUSED(address)
+    Q_UNUSED(contactId)
+}
+
+void DialServiceDepricated::dialVoipService(const QString& address, int serviceId)
+{
+    Q_UNUSED(address)
+    Q_UNUSED(serviceId)
+}
+
+void DialServiceDepricated::dialVoipService(
+        const QString& address, int serviceId, int contactId)
+{
+    Q_UNUSED(address)
+    Q_UNUSED(serviceId)
+    Q_UNUSED(contactId)
+}
+
+QString DialServiceDepricated::modifyPhoneNumber(const QString &number)
+{
+    return number;
+}
+
+QString DialServiceDepricated::simplified(const QString &number)
+{
+    return number;
+}
+
+QString DialServiceDepricated::japanPrefixModifications(const QString &number)
+{    
+    return number;
+}
+
+
 DTMFService::DTMFService(MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent) : 
     XQServiceProvider(QLatin1String("com.nokia.symbian.IDtmfPlay"), parent), m_call (call), m_parameters (parameters)
 {
@@ -152,15 +226,42 @@
 {
 }
 
-void DTMFService::playDTMFTone(const QChar& keyToPlay)
+int DTMFService::playDTMFTone(const QChar& keyToPlay)
 {
     Q_UNUSED(keyToPlay)
 }
 
-void DTMFService::stopDTMFPlay()
+int DTMFService::stopDTMFPlay()
 {
 }
 
+DTMFServiceDepricated::DTMFServiceDepricated(
+    MPECallControlIF &call, 
+    MPECallSettersIF &parameters, 
+    QObject* parent) 
+    : 
+    XQServiceProvider(
+        QLatin1String("com.nokia.symbian.IDtmfPlay"), parent), 
+    m_call(call), 
+    m_parameters(parameters)
+{
+    
+}
+
+DTMFServiceDepricated::~DTMFServiceDepricated()
+{
+}
+
+void DTMFServiceDepricated::playDTMFTone(const QChar& /*keyToPlay*/)
+{
+}
+
+void DTMFServiceDepricated::stopDTMFPlay()
+{
+
+}
+
+
 UriSchemeHandlerService::UriSchemeHandlerService(
     MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent)
     : 
--- a/phoneengine/phoneservices/tsrc/ut_phoneservices/ut_phoneservices.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_phoneservices/ut_phoneservices.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -44,7 +44,9 @@
 # Input
 HEADERS += ../../inc/phoneservices.h
 HEADERS += ../../inc/dialservice.h
+HEADERS += ../../inc/dialservicedepricated.h
 HEADERS += ../../inc/dtmfservice.h
+HEADERS += ../../inc/dtmfservicedepricated.h
 HEADERS += ../../inc/urischemehandlerservice.h
 SOURCES += ../../src/phoneservices.cpp
 SOURCES += unit_tests.cpp
--- a/phoneengine/phoneservices/tsrc/ut_urischemehandlerservice/unit_tests.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_urischemehandlerservice/unit_tests.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -113,8 +113,8 @@
 {
     QString unknownUri("mailto:alice@wonderland");
     
-    EXPECT(TelUriSchemeParser::isSupportedUriScheme).returns(false);
-    EXPECT(CPECallControlIFMock::HandleDialServiceCall).times(0);
+    EXPECT(TelUriSchemeParser, isSupportedUriScheme).returns(false);
+    EXPECT(CPECallControlIFMock, HandleDialServiceCall).times(0);
     
     bool handled = m_uriHandlerService->view(unknownUri);
     
@@ -125,11 +125,11 @@
 
 void UT_UriSchemeHandlerService::t_viewSupportedSchemeCapabilityCheckFails()
 {
-    EXPECT(TelUriSchemeParser::isSupportedUriScheme).returns(true);
+    EXPECT(TelUriSchemeParser, isSupportedUriScheme).returns(true);
     QSet<int> invalidCapabilities;
     invalidCapabilities.insert(ECapabilityNetworkServices);
-    EXPECT(XQRequestInfo::clientCapabilities).returns(invalidCapabilities);
-    EXPECT(CPECallControlIFMock::HandleDialServiceCall).times(0);
+    EXPECT(XQRequestInfo, clientCapabilities).returns(invalidCapabilities);
+    EXPECT(CPECallControlIFMock, HandleDialServiceCall).times(0);
     
     bool handled = m_uriHandlerService->view(KTelUriWithGlobalNumber);
     
@@ -140,13 +140,13 @@
 
 void UT_UriSchemeHandlerService::t_viewSupportedSchemeParsingFails()
 {
-    EXPECT(TelUriSchemeParser::isSupportedUriScheme).returns(true);
+    EXPECT(TelUriSchemeParser, isSupportedUriScheme).returns(true);
     QSet<int> validCapabilities;
     validCapabilities.insert(ECapabilityNetworkServices);
     validCapabilities.insert(ECapabilityNetworkControl);
-    EXPECT(XQRequestInfo::clientCapabilities).returns(validCapabilities);
-    EXPECT(TelUriSchemeParser::parseUri).returns(false);
-    EXPECT(CPECallControlIFMock::HandleDialServiceCall).times(0);
+    EXPECT(XQRequestInfo, clientCapabilities).returns(validCapabilities);
+    EXPECT(TelUriSchemeParser, parseUri).returns(false);
+    EXPECT(CPECallControlIFMock, HandleDialServiceCall).times(0);
     
     bool handled = m_uriHandlerService->view(KTelUriWithGlobalNumber);
     
@@ -157,15 +157,15 @@
 
 void UT_UriSchemeHandlerService::t_viewSupportedUriUserCancelsCall()
 {
-    EXPECT(TelUriSchemeParser::isSupportedUriScheme).returns(true);
+    EXPECT(TelUriSchemeParser, isSupportedUriScheme).returns(true);
     QSet<int> validCapabilities;
     validCapabilities.insert(ECapabilityNetworkServices);
     validCapabilities.insert(ECapabilityNetworkControl);
-    EXPECT(XQRequestInfo::clientCapabilities).returns(validCapabilities);
-    EXPECT(TelUriSchemeParser::parseUri).returns(true);
-    EXPECT(HbDeviceMessageBox::setTimeout).with(0);
-    EXPECT(HbDeviceMessageBox::isAcceptAction).returns(false);
-    EXPECT(CPECallControlIFMock::HandleDialServiceCall).times(0);
+    EXPECT(XQRequestInfo, clientCapabilities).returns(validCapabilities);
+    EXPECT(TelUriSchemeParser, parseUri).returns(true);
+    EXPECT(HbDeviceMessageBox, setTimeout).with(0);
+    EXPECT(HbDeviceMessageBox, isAcceptAction).returns(false);
+    EXPECT(CPECallControlIFMock, HandleDialServiceCall).times(0);
     
     bool handled = m_uriHandlerService->view(KTelUriWithGlobalNumber);
     
@@ -176,21 +176,21 @@
 
 void UT_UriSchemeHandlerService::t_viewSupportedUriUserAcceptsCall()
 {
-    EXPECT(TelUriSchemeParser::isSupportedUriScheme).returns(true);
+    EXPECT(TelUriSchemeParser, isSupportedUriScheme).returns(true);
     QSet<int> validCapabilities;
     validCapabilities.insert(ECapabilityNetworkServices);
     validCapabilities.insert(ECapabilityNetworkControl);
-    EXPECT(XQRequestInfo::clientCapabilities).returns(validCapabilities);
-    EXPECT(TelUriSchemeParser::parseUri)
+    EXPECT(XQRequestInfo, clientCapabilities).returns(validCapabilities);
+    EXPECT(TelUriSchemeParser, parseUri)
         .willOnce(invoke(setPhoneNumber))
         .returns(true);
-    EXPECT(HbDeviceMessageBox::setTimeout).with(0);
-    EXPECT(HbDeviceMessageBox::isAcceptAction).returns(true);
+    EXPECT(HbDeviceMessageBox, setTimeout).with(0);
+    EXPECT(HbDeviceMessageBox, isAcceptAction).returns(true);
     
     _LIT(KExpectedDialString, "+358401234567890");
-    EXPECT(CPECallSettersIFMock::SetPhoneNumber).with(KExpectedDialString());
-    EXPECT(CPECallSettersIFMock::SetCallTypeCommand).with(EPECallTypeCSVoice);
-    EXPECT(CPECallControlIFMock::HandleDialServiceCall).returns(KErrNone);
+    EXPECT(CPECallSettersIFMock, SetPhoneNumber).with(KExpectedDialString());
+    EXPECT(CPECallSettersIFMock, SetCallTypeCommand).with(EPECallTypeCSVoice);
+    EXPECT(CPECallControlIFMock, HandleDialServiceCall).returns(KErrNone);
     
     bool handled = m_uriHandlerService->view(KTelUriWithGlobalNumber);
     
@@ -201,21 +201,21 @@
 
 void UT_UriSchemeHandlerService::t_viewSupportedUriCallRequestFails()
 {
-    EXPECT(TelUriSchemeParser::isSupportedUriScheme).returns(true);
+    EXPECT(TelUriSchemeParser, isSupportedUriScheme).returns(true);
     QSet<int> validCapabilities;
     validCapabilities.insert(ECapabilityNetworkServices);
     validCapabilities.insert(ECapabilityNetworkControl);
-    EXPECT(XQRequestInfo::clientCapabilities).returns(validCapabilities);
-    EXPECT(TelUriSchemeParser::parseUri)
+    EXPECT(XQRequestInfo, clientCapabilities).returns(validCapabilities);
+    EXPECT(TelUriSchemeParser, parseUri)
         .willOnce(invoke(setPhoneNumber))
         .returns(true);
-    EXPECT(HbDeviceMessageBox::setTimeout).with(0);
-    EXPECT(HbDeviceMessageBox::isAcceptAction).returns(true);
+    EXPECT(HbDeviceMessageBox, setTimeout).with(0);
+    EXPECT(HbDeviceMessageBox, isAcceptAction).returns(true);
     
     _LIT(KExpectedDialString, "+358401234567890");
-    EXPECT(CPECallSettersIFMock::SetPhoneNumber).with(KExpectedDialString());
-    EXPECT(CPECallSettersIFMock::SetCallTypeCommand).with(EPECallTypeCSVoice);
-    EXPECT(CPECallControlIFMock::HandleDialServiceCall).returns(KErrNoMemory);
+    EXPECT(CPECallSettersIFMock, SetPhoneNumber).with(KExpectedDialString());
+    EXPECT(CPECallSettersIFMock, SetCallTypeCommand).with(EPECallTypeCSVoice);
+    EXPECT(CPECallControlIFMock, HandleDialServiceCall).returns(KErrNoMemory);
     
     bool handled = m_uriHandlerService->view(KTelUriWithGlobalNumber);
     
--- a/phoneplugins/csplugin/inc/cspcall.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspcall.h	Thu Sep 02 20:26:16 2010 +0300
@@ -166,7 +166,7 @@
         * From MCSPUUSMessageObserver
         * UUS message received notification. 
         */
-        void UUSMessageReceived( TDesC& aMessage );        
+        void UUSMessageReceived( const TDesC& aMessage );        
         
 // from base class MCCPCSCall
 
@@ -476,8 +476,7 @@
         * @param aEtelState an ETel state
         * @return corresponding CCP state
         */
-        MCCPCallObserver::TCCPCallState 
-            CSPCall::CCPStateFromETelState(
+        MCCPCallObserver::TCCPCallState CCPStateFromETelState(
                 RMobileCall::TMobileCallStatus aEtelState );
                 
         /**
@@ -523,12 +522,12 @@
         /**
          * Implementation for UpdateCallInfo().       
          */
-        virtual void UpdateCallInfoImpl( RMobileCall::TMobileCallInfoV7 aCallInfo );
+        virtual void UpdateCallInfoImpl( const RMobileCall::TMobileCallInfoV7& aCallInfo );
         
         /**
          * Set call origin to CCCECallParameters.       
          */
-        virtual void UpdateCallOrigin( RMobileCall::TMobileCallInfoV7 aCallInfo );
+        virtual void UpdateCallOrigin( const RMobileCall::TMobileCallInfoV7& aCallInfo );
         
         /**
         * Reads information from cenrep.
@@ -556,7 +555,7 @@
         *       ETrue for calls added by ETel status monitor  
         */
         void UpdateCallNameNumberInfo(
-                RMobileCall::TMobileCallInfoV3& aCallInfo, 
+                const RMobileCall::TMobileCallInfoV3& aCallInfo, 
                 TBool aCallAddedByMonitor ); 
 
         /**
@@ -781,7 +780,7 @@
            * Allocate CallInfo into heap since it could be
            * too big fit to stack.
            */
-          RMobileCall::TMobileCallInfoV3 iEtelCallInfo;
+          RMobileCall::TMobileCallInfoV7 iEtelCallInfo;
           
           friend class UT_CSPCall;
           friend class MT_CConvergedCallProvider;
--- a/phoneplugins/csplugin/inc/cspcalladdedhandler.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspcalladdedhandler.h	Thu Sep 02 20:26:16 2010 +0300
@@ -125,7 +125,7 @@
         * @param aLineId line identifier
         */
         void CallAdded( RMobileLine& aLine, 
-                        TName aCallName,
+                        const TName& aCallName,
                         RCSPLineContainer::TCSPLineId aLineId );
 
     private: // data
--- a/phoneplugins/csplugin/inc/cspclientvideocall.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspclientvideocall.h	Thu Sep 02 20:26:16 2010 +0300
@@ -115,7 +115,7 @@
         /**
         * Update call info.  
         */
-        void UpdateCallInfoImpl( RMobileCall::TMobileCallInfoV7 aCallInfo ); 
+        void UpdateCallInfoImpl( const RMobileCall::TMobileCallInfoV7& aCallInfo ); 
         
     private: // Data
         
--- a/phoneplugins/csplugin/inc/cspclientvoicecall.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspclientvoicecall.h	Thu Sep 02 20:26:16 2010 +0300
@@ -98,7 +98,7 @@
         /**
         * Update call info.  
         */
-        void UpdateCallInfoImpl( RMobileCall::TMobileCallInfoV7 aCallInfo );
+        void UpdateCallInfoImpl( const RMobileCall::TMobileCallInfoV7& aCallInfo );
         
     private: // Data
         
--- a/phoneplugins/csplugin/inc/cspetelcallrequester.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspetelcallrequester.h	Thu Sep 02 20:26:16 2010 +0300
@@ -102,7 +102,7 @@
         */         
         TInt MakeDialRequest( 
             const TDesC8& aCallParams, 
-            TDesC& aRemoteParty );
+            const TDesC& aRemoteParty );
 
         /**
         * Makes a dial request without FDN check.
@@ -113,7 +113,7 @@
         */         
         TInt MakeDialNoFdnCheckRequest( 
             const TDesC8& aCallParams, 
-            TDesC& aRemoteParty );
+            const TDesC& aRemoteParty );
             
         
         /**
@@ -150,7 +150,7 @@
         * Cancel dial (applies both emergency and normal calls)
         * @return result of cancel (system wide error code)
         */
-        TInt CSPEtelCallRequester::DialCancel();
+        TInt DialCancel();
         
     protected: // From CActive
         /**
@@ -199,4 +199,5 @@
 
     };
 
-#endif // CSPETELCALLREQUESTER_H
\ No newline at end of file
+#endif // CSPETELCALLREQUESTER_H
+
--- a/phoneplugins/csplugin/inc/cspetelcallwaitingrequester.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspetelcallwaitingrequester.h	Thu Sep 02 20:26:16 2010 +0300
@@ -102,14 +102,14 @@
         * @param aPhone mobile phone reference needed for reading cw setting
         *
         */
-        CSPEtelCallWaitingRequester::CSPEtelCallWaitingRequester(RMobilePhone& aPhone);
+        CSPEtelCallWaitingRequester(RMobilePhone& aPhone);
                               
         /**
         * Constructs the requester.
         *
         * @param aPhone phone reference
         */
-        void CSPEtelCallWaitingRequester::ConstructL();
+        void ConstructL();
         
         /**
         * Starts monitoring call waiting setting.
--- a/phoneplugins/csplugin/inc/csplogger.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/csplogger.h	Thu Sep 02 20:26:16 2010 +0300
@@ -171,23 +171,24 @@
 #elif CSP_LOGGING_METHOD == 2    // RDebug
 
 #define CSPLOGTEXT(Type,AAA)                { \
-                                            if((CSPLOGMASK()&(Type))==(Type)) RDebug::Print(AAA); \
+                                            if((CSPLOGMASK()&(Type))==(Type)) \
+                                                    { RDebug::Print(AAA); } \
                                             }
 #define CSPLOGSTRING(Type,AAA)              { \
                                             if((CSPLOGMASK()&(Type))== \
-                                            (Type)) RDebug::Print(_L(AAA)); \
+                                            (Type)) { RDebug::Print(_L(AAA)); } \
                                             }
 #define CSPLOGSTRING2(Type,AAA,BBB)         { \
                                             if((CSPLOGMASK()&(Type))== \
-                                            (Type)) RDebug::Print(_L(AAA),BBB); \
+                                            (Type)) { RDebug::Print(_L(AAA),BBB); } \
                                             }
 #define CSPLOGSTRING3(Type,AAA,BBB,CCC)     { \
                                             if((CSPLOGMASK()&(Type))== \
-                                            (Type)) RDebug::Print(_L(AAA),BBB,CCC); \
+                                            (Type)) { RDebug::Print(_L(AAA),BBB,CCC); } \
                                             }
 #define CSPLOGSTRING4(Type,AAA,BBB,CCC,DDD) { \
                                             if((CSPLOGMASK()&(Type))== \
-                                            (Type)) RDebug::Print(_L(AAA),BBB,CCC,DDD); \
+                                            (Type)) { RDebug::Print(_L(AAA),BBB,CCC,DDD); } \
                                             }
 
 #else   // CSP_LOGGING_METHOD == 0 or invalid
--- a/phoneplugins/csplugin/inc/csprovider.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/csprovider.h	Thu Sep 02 20:26:16 2010 +0300
@@ -257,7 +257,7 @@
         * @param aCallName the name of call
         * @param aLineId line identifier for the call
         */    
-        void IncomingCallArrived( RMobileLine& aLine, TName aCallName,
+        void IncomingCallArrived( RMobileLine& aLine, const TName& aCallName,
                                   RCSPLineContainer::TCSPLineId aLineId );
         
 // from base class MCSPCommonInfo
@@ -435,8 +435,9 @@
         * @param aAddr address
         * @param aSsTypeAndMode ss type and mode struct
         */
-        void HandleDivertOrBarring(TDesC& addr, 
-                         RMmCustomAPI::TSsTypeAndMode& aSsTypeAndMode);
+        void HandleDivertOrBarring(
+                const TDesC& addr, 
+                RMmCustomAPI::TSsTypeAndMode& aSsTypeAndMode );
         
         /**
         * Handles SIM status
--- a/phoneplugins/csplugin/inc/cspvideocall.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspvideocall.h	Thu Sep 02 20:26:16 2010 +0300
@@ -76,7 +76,7 @@
         * Informs about ready data connection.
         * @aPortName name of data port
         */
-        void ConnectionReady( TName aDataPortName );
+        void ConnectionReady( TName& aDataPortName );
         
         /**
         * Error occurred when establishing connection.
--- a/phoneplugins/csplugin/inc/mcspincomingcallobserver.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/mcspincomingcallobserver.h	Thu Sep 02 20:26:16 2010 +0300
@@ -43,7 +43,7 @@
         * @param aCallName the name of the call
         */    
         virtual void IncomingCallArrived( RMobileLine& aLine, 
-                                  TName aCallName,
+                                  const TName& aCallName,
                                   RCSPLineContainer::TCSPLineId aLineId ) = 0;
 
 
--- a/phoneplugins/csplugin/inc/mcspuusmessageobserver.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/inc/mcspuusmessageobserver.h	Thu Sep 02 20:26:16 2010 +0300
@@ -38,7 +38,7 @@
         * @since S60 3.2
         * @param aMessage
         */    
-        virtual void UUSMessageReceived( TDesC& aMessage ) = 0;
+        virtual void UUSMessageReceived( const TDesC& aMessage ) = 0;
     };
 
 #endif // MCSPUUSMESSAGEOBSERVER_H
--- a/phoneplugins/csplugin/src/cspcall.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/cspcall.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -1011,8 +1011,8 @@
     CSPLOGSTRING(CSPREQIN, "CSPCall::IsCallForwarded <");
     TBool ret( EFalse );
     TInt err( KErrNone );
-    RMobileCall::TMobileCallInfoV3Pckg pck( iEtelCallInfo );
-    err = iCall.GetMobileCallInfo( pck );
+    RMobileCall::TMobileCallInfoV7Pckg pck( iEtelCallInfo );
+    err = GetMobileCallInfo( pck );
     if (err == KErrNone )
         {
         ret = iEtelCallInfo.iForwarded;
@@ -1231,12 +1231,28 @@
                     iLine( aLine ),
                     iMobileOriginated( aMobileOriginated ),
                     iName( aName ), 
+                    iParams( NULL ),
+                    iCallState( MCCPCallObserver::ECCPStateIdle ),
+                    iCapsFlags( 0 ),
+                    iCallStatusMonitor( NULL ),
+                    iCallEventMonitor( NULL ),
+                    iCallInfoMonitor( NULL ),
+                    iRequester( NULL ),
+                    iDialCompletionCode( KErrNone ),
                     iCommonInfo( aCommonInfo ),
                     iTerminationErrorNotified( EFalse ),
                     iIsEmergencyCall( aIsEmergencyCall),
-                    iFdnCheck(ETrue),
-                    iAudioStatus( ECSPCallAudioStatusInactive ) 
-                    
+                    iTransferProvider( NULL ),
+                    iForwardProvider( NULL ),
+                    iAudioHandler( NULL ),
+                    iFdnCheck( ETrue ),
+                    iCallCapsMonitor( NULL ),
+                    iUUIMonitor( NULL ),
+                    iUUIMessageSender( NULL ),
+                    iSkypeId( NULL ),
+                    iAudioStatus( ECSPCallAudioStatusInactive ),
+                    iDontReportTerm( EFalse ),
+                    iUserToUserInformation( NULL )
     {
     CSPLOGSTRING(CSPOBJECT, "CSPCall::CSPCall");
     }
@@ -1301,11 +1317,9 @@
 void CSPCall::UpdateCallInfo()
     {
     CSPLOGSTRING(CSPINT, "CSPCall::UpdateCallInfo <");
-    RMobileCall::TMobileCallInfoV7 callInfo;
-    RMobileCall::TMobileCallInfoV7Pckg pck( callInfo );
-    TInt err = iCall.GetMobileCallInfo( pck );
-    
-    UpdateCallInfoImpl( callInfo );
+    RMobileCall::TMobileCallInfoV7Pckg pck( iEtelCallInfo );
+    TInt err = GetMobileCallInfo( pck );
+    UpdateCallInfoImpl( iEtelCallInfo );
 
     CSPLOGSTRING(CSPINT, "CSPCall::UpdateCallInfo >");
     }
@@ -1315,7 +1329,7 @@
 // Implementation for UpdateCallInfo().
 // ---------------------------------------------------------------------------
 //    
-void CSPCall::UpdateCallInfoImpl( RMobileCall::TMobileCallInfoV7 aCallInfo )
+void CSPCall::UpdateCallInfoImpl( const RMobileCall::TMobileCallInfoV7& aCallInfo )
     {
     CSPLOGSTRING(CSPINT, "CSPCall::UpdateCallInfoImpl <");
 
@@ -1339,7 +1353,7 @@
 // Set call origin to CCCECallParameters.
 // ---------------------------------------------------------------------------
 //    
-void CSPCall::UpdateCallOrigin( RMobileCall::TMobileCallInfoV7 aCallInfo )
+void CSPCall::UpdateCallOrigin( const RMobileCall::TMobileCallInfoV7& aCallInfo )
     {
     CSPLOGSTRING(CSPINT, "CSPCall::UpdateCallOrigin <");
 
@@ -1389,7 +1403,7 @@
     // TSY does not send notification so number must be fetched.
     if ( IsMobileOriginated() )
         {
-        RMobileCall::TMobileCallInfoV3Pckg callInfoPckg( iEtelCallInfo );
+        RMobileCall::TMobileCallInfoV7Pckg callInfoPckg( iEtelCallInfo );
         GetMobileCallInfo( callInfoPckg );
         if ( iEtelCallInfo.iRemoteParty.iRemoteNumber.iTelNumber.Length() )
             {
@@ -1762,8 +1776,8 @@
     CSPLOGSTRING2(CSPINT, "CSPCall::ExitCodeError < this: %x", 
                     this );
     TInt callError;
-    RMobileCall::TMobileCallInfoV3Pckg pck( iEtelCallInfo );
-    TInt getErr = iCall.GetMobileCallInfo( pck );
+    RMobileCall::TMobileCallInfoV7Pckg pck( iEtelCallInfo );
+    TInt getErr = GetMobileCallInfo( pck );
     // Is there value in higher 16 bits
     if ( KErrNone == getErr && (iEtelCallInfo.iExitCode & 0xFFFF0000) ) 
         {
@@ -1807,7 +1821,7 @@
 // CSPCall::UUSMessageReceived
 // ---------------------------------------------------------------------------
 //
- void CSPCall::UUSMessageReceived( TDesC& aMessage )
+ void CSPCall::UUSMessageReceived( const TDesC& aMessage )
     {      
     CSPLOGSTRING(CSPREQIN, "CSPCall::UUSMessageReceived");
     TCSPSkypeIdParser parser;
@@ -1861,7 +1875,7 @@
 // ---------------------------------------------------------------------------
 //    
 void CSPCall::UpdateCallNameNumberInfo(
-        RMobileCall::TMobileCallInfoV3& aCallInfo, 
+        const RMobileCall::TMobileCallInfoV3& aCallInfo, 
         TBool aCallAddedByMonitor )
     {
     CSPLOGSTRING(CSPINT, "CSPCall::UpdateCallNameNumberInfo <");
--- a/phoneplugins/csplugin/src/cspcalladdedhandler.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/cspcalladdedhandler.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -72,7 +72,7 @@
 // ---------------------------------------------------------------------------
 //
 void CSPCallAddedHandler::CallAdded( RMobileLine& aLine, 
-                        TName aCallName,
+                        const TName& aCallName,
                         RCSPLineContainer::TCSPLineId aLineId )
     {
     CSPLOGSTRING2(CSPINT, 
--- a/phoneplugins/csplugin/src/cspclientvideocall.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/cspclientvideocall.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -187,7 +187,7 @@
 // Update call info including remote party name and number data  
 // ---------------------------------------------------------------------------
 //    
-void CSPClientVideoCall::UpdateCallInfoImpl( RMobileCall::TMobileCallInfoV7 aCallInfo )
+void CSPClientVideoCall::UpdateCallInfoImpl( const RMobileCall::TMobileCallInfoV7& aCallInfo )
     {
     CSPLOGSTRING(CSPINT, "CSPClientVideoCall::UpdateCallInfoImpl <");
     
--- a/phoneplugins/csplugin/src/cspclientvoicecall.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/cspclientvoicecall.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -176,7 +176,7 @@
 // Update call info including remote party name and number data  
 // ---------------------------------------------------------------------------
 //    
-void CSPClientVoiceCall::UpdateCallInfoImpl( RMobileCall::TMobileCallInfoV7 aCallInfo )
+void CSPClientVoiceCall::UpdateCallInfoImpl( const RMobileCall::TMobileCallInfoV7& aCallInfo )
     {
     CSPLOGSTRING(CSPINT, "CSPClientVoiceCall::UpdateCallInfoImpl <");    
 
--- a/phoneplugins/csplugin/src/cspetelcallrequester.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/cspetelcallrequester.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -57,7 +57,7 @@
 //
 TInt CSPEtelCallRequester::MakeDialRequest( 
             const TDesC8& aCallParams, 
-            TDesC& aRecipient )
+            const TDesC& aRecipient )
     {
     CSPLOGSTRING(CSPINT, "CSPEtelCallRequester::MakeDialRequest" );
     iRequestType = ERequestTypeDial;
@@ -81,7 +81,7 @@
 //
 TInt CSPEtelCallRequester::MakeDialNoFdnCheckRequest( 
             const TDesC8& aCallParams, 
-            TDesC& aRecipient )
+            const TDesC& aRecipient )
     {
     CSPLOGSTRING(CSPINT, "CSPEtelCallRequester::MakeDialNoFdnCheckRequest" );
     iRequestType = ERequestTypeDial;
--- a/phoneplugins/csplugin/src/csppubsublistener.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/csppubsublistener.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -96,7 +96,7 @@
         CSPPubSubListener( aUid, aKey, aObserver );
     CleanupStack::PushL( self );
     self->ConstructL();
-    CleanupStack::Pop();
+    CleanupStack::Pop( self );
     return self;
     }
 
--- a/phoneplugins/csplugin/src/csprovider.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/csprovider.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -54,10 +54,30 @@
 // CSProvider::CSProvider
 // ---------------------------------------------------------------------------
 //
-CSProvider::CSProvider(): iImplementationUid( KCSPImplementationUid )
+CSProvider::CSProvider(): iImplementationUid( KCSPImplementationUid ),
+        iCCPObserver( NULL ),
+        iSsObserver( NULL ),
+        iDTMFProvider( NULL ),
+        iIncomingVoiceCallMonitor( NULL ),
+        iIncomingDataCallMonitor( NULL ),
+        iIncomingAuxCallMonitor( NULL ),
+        iCallArray( NULL ),
+        iServiceHandler( NULL ),
+        iInitialized( EFalse ),
+        iCallAddedHandler( NULL ),
+        iServiceId( 0 ),
+        iAudioHandler( NULL ),
+        iCwRequester( NULL ),
+        iSsMonitor( NULL ),
+        iCipheringStatusMonitor( NULL ),
+        iSsSettingsHandler( NULL ),
+        iSimStatusListener( NULL ),
+        iCallCommandHandler( NULL ),
+        iRemoteAlertingToneListener( NULL ),
+        iConferenceStatusMonitor( NULL ),
+        iConferenceCall( NULL )
     {
     CSPLOGSTRING(CSPOBJECT, "CSProvider::CSProvider");
-    iInitialized = EFalse;
     }
 
 // ---------------------------------------------------------------------------
@@ -139,7 +159,7 @@
                     RMmCustomAPI::TSsInfo& aSsInfo )
     {
     CSPLOGSTRING(CSPINT, "CSProvider::NotifySsEvent <");
-    TBuf<10> addr;
+    const TDesC& addr = KNullDesC;
     
     switch( aSsTypeAndMode.iSsType )
         {
@@ -645,7 +665,7 @@
 // CSProvider::IncomingCallArrived
 // ---------------------------------------------------------------------------
 //
-void CSProvider::IncomingCallArrived( RMobileLine& aLine, TName aCallName,
+void CSProvider::IncomingCallArrived( RMobileLine& aLine, const TName& aCallName,
                                       RCSPLineContainer::TCSPLineId aLineId )
     {
     RMobileLine::TLineInfo lineInfo;
@@ -946,7 +966,9 @@
 // Helper method.
 // ---------------------------------------------------------------------------
 //
-void CSProvider::HandleDivertOrBarring(TDesC& addr, RMmCustomAPI::TSsTypeAndMode& aSsTypeAndMode)
+void CSProvider::HandleDivertOrBarring(
+        const TDesC& addr,
+        RMmCustomAPI::TSsTypeAndMode& aSsTypeAndMode )
     {
     CSPLOGSTRING(CSPINT, "CSProvider::HandleDivertOrBarring <");
     switch ( aSsTypeAndMode.iSsType )
--- a/phoneplugins/csplugin/src/cspvideocall.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/csplugin/src/cspvideocall.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -140,7 +140,7 @@
 // CSPVideoCall::ConnectionReady
 // ---------------------------------------------------------------------------
 //
-void CSPVideoCall::ConnectionReady( TName aDataPortName )
+void CSPVideoCall::ConnectionReady( TName& aDataPortName )
     {
     CSPLOGSTRING3(CSPINT, "CSPVideoCall::ConnectionReady \
         state = %d, next state: %d", iCallState, iNextCallState);
@@ -303,7 +303,7 @@
         }    
         
     // Filter out illegal requests    
-     if ( !CCPCall::ECallTypeVideo == iParams->CallType() )
+     if ( !(CCPCall::ECallTypeVideo == iParams->CallType()) )
         {
         CSPLOGSTRING(CSPERROR, "CSPVideoCall::ConstructL() error invalid call type");
         User::Leave( KErrArgument );
--- a/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -35,8 +35,8 @@
 #include <xqservicerequest.h>
 #include <xqcallinfo.h>
 #include <xqpublishandsubscribeutils.h>
-#include <logsservices.h>
 #include <xqrequestinfo.h>
+#include <xqaiwdecl.h>
 #endif
 
 namespace
@@ -103,24 +103,22 @@
     } else {
         PHONE_DEBUG("no calls, open Dialer");
         service = "logs";
-        interface = "com.nokia.symbian.ILogsView";
-        operation = "show(QVariantMap)";
+        interface = XQI_LOGS_VIEW;
+        operation = XQOP_LOGS_SHOW;
         QVariantMap map;
-        map.insert("view_index", QVariant(int(LogsServices::ViewAll)));
-        map.insert("show_dialpad", QVariant(true));
-        map.insert("dialpad_text", QVariant(QString()));
+        map.insert(XQLOGS_VIEW_INDEX, QVariant(int(XQService::LogsViewAll)));
+        map.insert(XQLOGS_SHOW_DIALPAD, QVariant(true));
+        map.insert(XQLOGS_DIALPAD_TEXT, QVariant(QString()));
         args.append(QVariant(map));
     }
 
     XQApplicationManager appManager;
     QScopedPointer<XQAiwRequest> request(appManager.create(service, interface, operation, false));
     if (request == NULL) {
+        PHONE_TRACE1("service not found");
         return;
     }
     request->setArguments(args);
-    XQRequestInfo info;
-    info.setForeground(true);
-    request->setInfo(info);
     bool ret = request->send();
     PHONE_TRACE2("request sent successfully:", ret);
 #endif
--- a/phoneplugins/dialerwidgetplugin/src/dialerwidgetengine.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/src/dialerwidgetengine.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -18,7 +18,6 @@
 #include "dialerwidgetengine.h"
 
 #include <logsdomaincrkeys.h>
-#include <logsservices.h>
 
 DialerWidgetEngine::DialerWidgetEngine():
     m_missedCalls(-1)
--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_infowidget.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_infowidget.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -363,36 +363,14 @@
     }
 
 
-
 // -----------------------------------------------------------------------------
-// InfoWidget::mousePressEvent
+// InfoWidget::gestureEvent
 // -----------------------------------------------------------------------------
 //
-void InfoWidget::mousePressEvent( 
-        QGraphicsSceneMouseEvent * event )
-    {
-    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::mouseReleaseEvent
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-    {
-    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )    
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::mouseMoveEvent
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-    {
-    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
-    }
+void InfoWidget::gestureEvent(QGestureEvent *event)
+{
+    SMC_MOCK_METHOD1( void, QGestureEvent *, event )
+}
 
 
 // -----------------------------------------------------------------------------
@@ -446,7 +424,7 @@
     SMC_MOCK_METHOD0( void )
     }
 
-
+/*
 // -----------------------------------------------------------------------------
 // InfoWidget::installTranslator
 // -----------------------------------------------------------------------------
@@ -466,5 +444,5 @@
     {
     SMC_MOCK_METHOD0( void )
     }
+*/
 
-
--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_xqsettingsmanager.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_xqsettingsmanager.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -49,7 +49,7 @@
         const XQSettingsKey & key,
         XQSettingsManager::Type type )
     {
-    SMC_MOCK_METHOD2( QVariant, XQSettingsKey &, key, XQSettingsManager::Type, type )
+    SMC_MOCK_METHOD2( QVariant, const XQSettingsKey &, key, XQSettingsManager::Type, type )
     }
 
 
@@ -61,7 +61,7 @@
         const XQSettingsKey & key,
         const QVariant & value )
     {
-    SMC_MOCK_METHOD2( bool, XQSettingsKey &, key, QVariant &, value )
+    SMC_MOCK_METHOD2( bool, const XQSettingsKey &, key, const QVariant &, value )
     }
 
 
@@ -73,7 +73,7 @@
         const XQSettingsKey & key,
         XQSettingsManager::Type type )
     {
-    SMC_MOCK_METHOD2( bool, XQSettingsKey &, key, XQSettingsManager::Type, type )
+    SMC_MOCK_METHOD2( bool, const XQSettingsKey &, key, XQSettingsManager::Type, type )
     }
 
 
@@ -84,7 +84,7 @@
 bool XQSettingsManager::stopMonitoring( 
         const XQSettingsKey & key )
     {
-    SMC_MOCK_METHOD1( bool, XQSettingsKey &, key )
+    SMC_MOCK_METHOD1( bool, const XQSettingsKey &, key )
     }
 
 
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -135,7 +135,7 @@
  */
 void UT_InfoWidget::t_setSpnDisplay()
 {
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySpn, KPreferenceOn);
     
     m_infoWidget->setSpnDisplay(KPreferenceOn);
@@ -148,7 +148,7 @@
  */
 void UT_InfoWidget::t_setMcnDisplay()
 {
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOn);
     
     m_infoWidget->setMcnDisplay(KPreferenceOn);
@@ -161,7 +161,7 @@
  */
 void UT_InfoWidget::t_setSatDisplay()
 {
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySatText, KPreferenceOn);
     
     m_infoWidget->setSatDisplay(KPreferenceOn);
@@ -208,35 +208,35 @@
     const InfoWidgetEngine::ModelData& modelDataConstRef(modelData); 
     
     // Test 1: text data has been initialized to model (in UT_InfoWidget::UT_InfoWidget())
-    EXPECT(InfoWidgetLayoutManager::currentDisplayRole).returns(InfoWidgetLayoutManager::InfoDisplay);
-    EXPECT(InfoWidgetEngine::modelData).returns(modelDataConstRef);
+    EXPECT(InfoWidgetLayoutManager, currentDisplayRole).returns(InfoWidgetLayoutManager::InfoDisplay);
+    EXPECT(InfoWidgetEngine, modelData).returns(modelDataConstRef);
 
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleSpnMarqueeItem)
         .returns(pointerSpnMarqueeItem);
-    EXPECT(HbMarqueeItem::setText);
-    EXPECT(HbMarqueeItem::setTextColor);
-    EXPECT(QGraphicsWidget::adjustSize); 
-    EXPECT(InfoWidgetLayoutManager::textFitsToRect)
+    EXPECT(HbMarqueeItem, setText);
+    EXPECT(HbMarqueeItem, setTextColor);
+    EXPECT(QGraphicsWidget, adjustSize); 
+    EXPECT(InfoWidgetLayoutManager, textFitsToRect)
         .returns(false);
 
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleMcnMarqueeItem)
         .returns(pointerSpnMarqueeItem);
-    EXPECT(HbMarqueeItem::setText);
-    EXPECT(HbMarqueeItem::setTextColor);
-    EXPECT(QGraphicsWidget::adjustSize); 
-    EXPECT(InfoWidgetLayoutManager::textFitsToRect)
+    EXPECT(HbMarqueeItem, setText);
+    EXPECT(HbMarqueeItem, setTextColor);
+    EXPECT(QGraphicsWidget, adjustSize); 
+    EXPECT(InfoWidgetLayoutManager, textFitsToRect)
         .returns(false);
 
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleSatMarqueeItem)
         .returns(pointerSatMarqueeItem);
     
-    EXPECT(HbMarqueeItem::setText);
-    EXPECT(HbMarqueeItem::setTextColor);
-    EXPECT(QGraphicsWidget::adjustSize); 
-    EXPECT(InfoWidgetLayoutManager::textFitsToRect)
+    EXPECT(HbMarqueeItem, setText);
+    EXPECT(HbMarqueeItem, setTextColor);
+    EXPECT(QGraphicsWidget, adjustSize); 
+    EXPECT(InfoWidgetLayoutManager, textFitsToRect)
         .returns(false);
  
     m_infoWidget->updateInfoDisplay();
@@ -245,37 +245,37 @@
     QVERIFY(verify());
     
     // Test 2: empty data, verify items are not appended to m_animatingItems
-    EXPECT(InfoWidgetLayoutManager::currentDisplayRole).returns(InfoWidgetLayoutManager::InfoDisplay);
-    EXPECT(InfoWidgetEngine::modelData).returns(modelDataConstRef);
+    EXPECT(InfoWidgetLayoutManager, currentDisplayRole).returns(InfoWidgetLayoutManager::InfoDisplay);
+    EXPECT(InfoWidgetEngine, modelData).returns(modelDataConstRef);
 
     m_modelData.setServiceProviderName("testspn");
     m_modelData.setMcnName("testmcn");
     m_modelData.setSatDisplayText("testsat");
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleSpnMarqueeItem)
         .returns(pointerSpnMarqueeItem);
-    EXPECT(HbMarqueeItem::setText);
-    EXPECT(HbMarqueeItem::setTextColor);
-    EXPECT(QGraphicsWidget::adjustSize); 
-    EXPECT(InfoWidgetLayoutManager::textFitsToRect)
+    EXPECT(HbMarqueeItem, setText);
+    EXPECT(HbMarqueeItem, setTextColor);
+    EXPECT(QGraphicsWidget, adjustSize); 
+    EXPECT(InfoWidgetLayoutManager, textFitsToRect)
         .returns(true);
     
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleMcnMarqueeItem)
         .returns(pointerSpnMarqueeItem);
-    EXPECT(HbMarqueeItem::setText);
-    EXPECT(HbMarqueeItem::setTextColor);
-    EXPECT(QGraphicsWidget::adjustSize); 
-    EXPECT(InfoWidgetLayoutManager::textFitsToRect)
+    EXPECT(HbMarqueeItem, setText);
+    EXPECT(HbMarqueeItem, setTextColor);
+    EXPECT(QGraphicsWidget, adjustSize); 
+    EXPECT(InfoWidgetLayoutManager, textFitsToRect)
         .returns(true);
 
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleSatMarqueeItem)
         .returns(pointerSatMarqueeItem);
-    EXPECT(HbMarqueeItem::setText);
-    EXPECT(HbMarqueeItem::setTextColor);
-    EXPECT(QGraphicsWidget::adjustSize); 
-    EXPECT(InfoWidgetLayoutManager::textFitsToRect)
+    EXPECT(HbMarqueeItem, setText);
+    EXPECT(HbMarqueeItem, setTextColor);
+    EXPECT(QGraphicsWidget, adjustSize); 
+    EXPECT(InfoWidgetLayoutManager, textFitsToRect)
         .returns(true);
 
     m_infoWidget->updateInfoDisplay();
@@ -296,30 +296,30 @@
  */
 void UT_InfoWidget::t_readPersistentPreferences()
 {    
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplayHomeZone, QString(""));
 
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplayMcn, QString(""));
     
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplayActiveLine, QString(""));
     
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySatText, QString(""));
 
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySpn, QString(""));
     
-    EXPECT(InfoWidgetPreferences::validate);
+    EXPECT(InfoWidgetPreferences, validate);
 
     m_infoWidget->readPersistentPreferences();
     
     QVERIFY(verify());
     
     // one visible item initially
-    EXPECT(InfoWidgetPreferences::validate).returns(true);
-    EXPECT(InfoWidgetPreferences::storePreferences);
+    EXPECT(InfoWidgetPreferences, validate).returns(true);
+    EXPECT(InfoWidgetPreferences, storePreferences);
     
     m_infoWidget->readPersistentPreferences();
     
@@ -336,13 +336,13 @@
     // Test onInitialize sequence where 
     // meta-object properties have been 
     // initialized 
-    EXPECT(InfoWidgetPreferences::validate)
+    EXPECT(InfoWidgetPreferences, validate)
         .returns(true);
-    EXPECT(InfoWidgetPreferences::storePreferences)
+    EXPECT(InfoWidgetPreferences, storePreferences)
         .returns(true);
-    EXPECT(InfoWidgetLayoutManager::contentWidget)
+    EXPECT(InfoWidgetLayoutManager, contentWidget)
         .returns(contentWidget);
-    EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
+    EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay)
         .returns(contentWidget);
       
     m_infoWidget->onInitialize();
@@ -350,11 +350,11 @@
     // Test onInitialize sequence where 
     // meta-object properties are 
     // uninitialized 
-    EXPECT(InfoWidgetPreferences::validate)
+    EXPECT(InfoWidgetPreferences, validate)
         .returns(false);
-    EXPECT(InfoWidgetLayoutManager::contentWidget)
+    EXPECT(InfoWidgetLayoutManager, contentWidget)
         .returns(contentWidget);
-    EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
+    EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay)
         .returns(contentWidget);
     m_infoWidget->onInitialize();
 }
@@ -374,15 +374,15 @@
 {
     
     m_infoWidget->m_animationState = InfoWidget::AnimationIdle; 
-    EXPECT(InfoWidgetEngine::resume);
+    EXPECT(InfoWidgetEngine, resume);
     m_infoWidget->onShow();
     
     m_infoWidget->m_animationState = InfoWidget::AnimationOngoing;
-    EXPECT(InfoWidgetEngine::resume);
+    EXPECT(InfoWidgetEngine, resume);
     m_infoWidget->onShow();
     
     m_infoWidget->m_animationState = InfoWidget::AnimationStarting;
-    EXPECT(InfoWidgetEngine::resume);
+    EXPECT(InfoWidgetEngine, resume);
     m_infoWidget->onShow(); 
 
 }
@@ -400,11 +400,11 @@
  */
 void UT_InfoWidget::t_readModel()
 {
-    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+    EXPECT(InfoWidgetLayoutManager, currentDisplayRole)
         .returns(InfoWidgetLayoutManager::InfoDisplay);
     m_infoWidget->readModel();
     
-    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+    EXPECT(InfoWidgetLayoutManager, currentDisplayRole)
         .returns(InfoWidgetLayoutManager::SettingsDialog);
     m_infoWidget->readModel();
     
@@ -424,13 +424,13 @@
 void UT_InfoWidget::t_spnDisplaySettingChanged()
 {
     // user enables home zone setting
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySpn, KPreferenceOn);
     int setting(Qt::Checked);
     m_infoWidget->spnDisplaySettingChanged(setting);
     
     // user disables home zone setting
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySpn, KPreferenceOff);
     setting = Qt::Unchecked;
     m_infoWidget->spnDisplaySettingChanged(setting);
@@ -441,13 +441,13 @@
 void UT_InfoWidget::t_mcnDisplaySettingChanged()
 {
     // user enables MCN setting
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOn);
     int setting(Qt::Checked);
     m_infoWidget->mcnDisplaySettingChanged(setting);
     
     // user disables MCN setting
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOff);
     setting = Qt::Unchecked;
     m_infoWidget->mcnDisplaySettingChanged(setting);
@@ -458,13 +458,13 @@
 void UT_InfoWidget::t_satDisplaySettingChanged()
 {
     // user enables SAT setting
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySatText, KPreferenceOn);
     int setting(Qt::Checked);
     m_infoWidget->satDisplaySettingChanged(setting);
     
     // user disables SAT setting
-    EXPECT(InfoWidgetPreferences::setPreference)
+    EXPECT(InfoWidgetPreferences, setPreference)
         .with(InfoWidgetPreferences::DisplaySatText, KPreferenceOff);
     setting = Qt::Unchecked;
     m_infoWidget->satDisplaySettingChanged(setting);
@@ -474,13 +474,13 @@
 
 void UT_InfoWidget::t_settingsEditingFinished()
 {
-    EXPECT(InfoWidgetPreferences::validate)
+    EXPECT(InfoWidgetPreferences, validate)
         .returns(true);
-    EXPECT(InfoWidgetPreferences::storePreferences)
+    EXPECT(InfoWidgetPreferences, storePreferences)
         .returns(false);
 
     QGraphicsWidget *contentWidget = NULL; 
-    EXPECT(InfoWidgetLayoutManager::contentWidget)
+    EXPECT(InfoWidgetLayoutManager, contentWidget)
         .returns(contentWidget);
 
     m_infoWidget->settingsEditingFinished(); 
@@ -489,13 +489,13 @@
 void UT_InfoWidget::t_updateItemsVisibility()
 {
     // all items visible
-    EXPECT(InfoWidgetPreferences::preference)
+    EXPECT(InfoWidgetPreferences, preference)
         .with(InfoWidgetPreferences::DisplaySpn)
         .returns(KPreferenceOn);
-    EXPECT(InfoWidgetPreferences::preference)
+    EXPECT(InfoWidgetPreferences, preference)
         .with(InfoWidgetPreferences::DisplayMcn)
         .returns(KPreferenceOn);
-    EXPECT(InfoWidgetPreferences::preference)
+    EXPECT(InfoWidgetPreferences, preference)
         .with(InfoWidgetPreferences::DisplaySatText)
         .returns(KPreferenceOn);
     
@@ -507,7 +507,7 @@
 void UT_InfoWidget::t_layoutInfoDisplay()
 {
     QGraphicsWidget *contentWidget = NULL; 
-    EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
+    EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay)
         .returns(contentWidget);
     m_infoWidget->layoutInfoDisplay();
     
@@ -517,7 +517,7 @@
 void UT_InfoWidget::t_layoutSettingsDialog()
 {
     QGraphicsWidget *contentWidget = NULL; 
-    EXPECT(InfoWidgetLayoutManager::layoutSettingsDialog)
+    EXPECT(InfoWidgetLayoutManager, layoutSettingsDialog)
         .returns(contentWidget);
     m_infoWidget->layoutSettingsDialog();
     
@@ -527,17 +527,17 @@
 void UT_InfoWidget::t_initializeSettingsDialogItems()
 {
     QGraphicsWidget spnCheckBox;
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleSpnCheckBox)
         .returns(&spnCheckBox);
 
     QGraphicsWidget mcnCheckBox;
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleMcnCheckBox)
         .returns(&mcnCheckBox);
     
     QGraphicsWidget satTextCheckBox;
-    EXPECT(InfoWidgetLayoutManager::getWidget)
+    EXPECT(InfoWidgetLayoutManager, getWidget)
         .with(InfoWidgetLayoutManager::RoleSatTextCheckBox)
         .returns(&satTextCheckBox);
     
@@ -565,7 +565,7 @@
      * Not work from commmand prompt.
      */
     HbEvent event(HbEvent::ThemeChanged);
-    EXPECT(HbWidget::changeEvent).with(&event);
+    EXPECT(HbWidget, changeEvent).with(&event);
     m_infoWidget->changeEvent(&event);
     QVERIFY(verify());
 }
@@ -587,7 +587,7 @@
     QVERIFY(KDefaultSizeInfoDisplay == m_infoWidget->sizeHint(
             sizeHint, constraint));
 
-    EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
+    EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay)
         .returns(contentWidget.data());
     // Test: size after onInitialize is called 
     // and current display is InfoDisplay 
@@ -597,9 +597,9 @@
     
     contentWidget.reset(new QGraphicsWidget);
     contentWidget->setMinimumSize(KMinimumSize); 
-    EXPECT(InfoWidgetLayoutManager::contentWidget)
+    EXPECT(InfoWidgetLayoutManager, contentWidget)
         .returns(contentWidget.data());
-    EXPECT(InfoWidgetPreferences::visibleItemCount).
+    EXPECT(InfoWidgetPreferences, visibleItemCount).
             returns(1);
     
     // No strict verification.
@@ -660,11 +660,11 @@
     m_infoWidget->m_animatingItems.append(&satMarqueeItem); 
  
     // Test 1: 
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(false);
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(false);
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(false);
     m_infoWidget->m_animationState = InfoWidget::AnimationOngoing; 
     m_infoWidget->stopMarquees();
@@ -680,11 +680,11 @@
     m_infoWidget->m_animatingItems.append(&mcnMarqueeItem);
     m_infoWidget->m_animatingItems.append(&satMarqueeItem); 
     
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(true);
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(true);
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(true);
 
     m_infoWidget->m_animationState = InfoWidget::AnimationOngoing; 
@@ -719,19 +719,19 @@
  
     // Test 1: verify loop functionality
     m_infoWidget->m_animatingItem = &spnMarqueeItem;
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(false);
     m_infoWidget->marqueeNext();
     QVERIFY(m_infoWidget->m_animatingItem == &mcnMarqueeItem); 
 
     // Test 2: verify loop functionality
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(false);
     m_infoWidget->marqueeNext();
     QVERIFY(m_infoWidget->m_animatingItem == &satMarqueeItem); 
 
     // Test 3: verify loop functionality, loop to begin
-    EXPECT(HbMarqueeItem::isAnimating).
+    EXPECT(HbMarqueeItem, isAnimating).
             returns(false);
     m_infoWidget->marqueeNext();
     QVERIFY(m_infoWidget->m_animatingItem == &spnMarqueeItem); 
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/ut_infowidget.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/ut_infowidget.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -64,3 +64,4 @@
 SOURCES += ../mocks/mock_qgraphicslayout.cpp
 SOURCES += ../mocks/mock_hbframedrawer.cpp
 SOURCES += ../mocks/mock_hbframeitem.cpp
+SOURCES += ../mocks/mock_rsatservice.cpp
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -61,21 +61,21 @@
     SmcDefaultValue<QString>::SetL("");
     SmcDefaultValue<const QString & >::SetL("");
     
-    EXPECT(InfoWidgetNetworkHandler::isOnline)
+    EXPECT(InfoWidgetNetworkHandler, isOnline)
         .returns(true);    
     
-    EXPECT(InfoWidgetNetworkHandler::serviceProviderName)
+    EXPECT(InfoWidgetNetworkHandler, serviceProviderName)
         .returns(KSpnName);
-    EXPECT(InfoWidgetNetworkHandler::serviceProviderNameDisplayRequired)
+    EXPECT(InfoWidgetNetworkHandler, serviceProviderNameDisplayRequired)
         .returns(true);
 
-    EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName);
-    EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType)
+    EXPECT(InfoWidgetNetworkHandler, mcnName).returns(KMcnName);
+    EXPECT(InfoWidgetNetworkHandler, mcnIndicatorType)
         .returns(KMcnIndicatorType);
 
-    EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType)
+    EXPECT(InfoWidgetNetworkHandler, homeZoneIndicatorType)
         .returns(KHomeZoneIndicatorType);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag)
+    EXPECT(InfoWidgetNetworkHandler, homeZoneTextTag)
         .returns(KHomeZoneTextTag);
     
     m_infoWidgetEngine = new InfoWidgetEngine();
@@ -114,21 +114,21 @@
 void UT_InfoWidgetEngine::t_updateNetworkDataToModel()
 {
     // Test: network status is online
-    EXPECT(InfoWidgetNetworkHandler::isOnline)
+    EXPECT(InfoWidgetNetworkHandler, isOnline)
         .returns(true);    
     
-    EXPECT(InfoWidgetNetworkHandler::serviceProviderName)
+    EXPECT(InfoWidgetNetworkHandler, serviceProviderName)
         .returns(KSpnName);
-    EXPECT(InfoWidgetNetworkHandler::serviceProviderNameDisplayRequired)
+    EXPECT(InfoWidgetNetworkHandler, serviceProviderNameDisplayRequired)
         .returns(true);
 
-    EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName);
-    EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType)
+    EXPECT(InfoWidgetNetworkHandler, mcnName).returns(KMcnName);
+    EXPECT(InfoWidgetNetworkHandler, mcnIndicatorType)
         .returns(KMcnIndicatorType);
 
-    EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType)
+    EXPECT(InfoWidgetNetworkHandler, homeZoneIndicatorType)
         .returns(KHomeZoneIndicatorType);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag)
+    EXPECT(InfoWidgetNetworkHandler, homeZoneTextTag)
         .returns(KHomeZoneTextTag);
     
     QSignalSpy spy(m_infoWidgetEngine, SIGNAL(modelChanged()));
@@ -142,14 +142,14 @@
     QVERIFY(verify());
     
     // Test: network status is offline
-    EXPECT(InfoWidgetNetworkHandler::isOnline)
+    EXPECT(InfoWidgetNetworkHandler, isOnline)
           .returns(false);    
-    EXPECT(InfoWidgetNetworkHandler::serviceProviderName).times(0);
-    EXPECT(InfoWidgetNetworkHandler::serviceProviderNameDisplayRequired).times(0);
-    EXPECT(InfoWidgetNetworkHandler::mcnName).times(0);
-    EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType).times(0);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType).times(0);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag).times(0);
+    EXPECT(InfoWidgetNetworkHandler, serviceProviderName).times(0);
+    EXPECT(InfoWidgetNetworkHandler, serviceProviderNameDisplayRequired).times(0);
+    EXPECT(InfoWidgetNetworkHandler, mcnName).times(0);
+    EXPECT(InfoWidgetNetworkHandler, mcnIndicatorType).times(0);
+    EXPECT(InfoWidgetNetworkHandler, homeZoneIndicatorType).times(0);
+    EXPECT(InfoWidgetNetworkHandler, homeZoneTextTag).times(0);
       
     m_infoWidgetEngine->updateNetworkDataToModel();
     QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions);
@@ -170,7 +170,7 @@
  */
 void UT_InfoWidgetEngine::t_updateSatDataToModel()
 {
-    EXPECT(InfoWidgetSatHandler::satDisplayText)
+    EXPECT(InfoWidgetSatHandler, satDisplayText)
         .returns(QString(""));
     
     m_infoWidgetEngine->updateSatDataToModel();
@@ -230,16 +230,16 @@
     // Test 1: Mcn ON; SAT OFF   
     testOptions |= InfoWidgetPreferences::DisplayMcn; 
     testOptions &= ~InfoWidgetPreferences::DisplaySatText;
-    EXPECT(InfoWidgetNetworkHandler::enableMcn); 
-    EXPECT(InfoWidgetSatHandler::connect).with(false);
+    EXPECT(InfoWidgetNetworkHandler, enableMcn); 
+    EXPECT(InfoWidgetSatHandler, connect).with(false);
     m_infoWidgetEngine->handlePreferencesChanged(testOptions); 
     QVERIFY(verify());    
     
     // Test 2: Mcn OFF; SAT ON   
     testOptions &= ~InfoWidgetPreferences::DisplayMcn; 
     testOptions |= InfoWidgetPreferences::DisplaySatText;
-    EXPECT(InfoWidgetNetworkHandler::disableMcn); 
-    EXPECT(InfoWidgetSatHandler::connect).with(true);
+    EXPECT(InfoWidgetNetworkHandler, disableMcn); 
+    EXPECT(InfoWidgetSatHandler, connect).with(true);
     m_infoWidgetEngine->handlePreferencesChanged(testOptions); 
     QVERIFY(verify());    
 
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h	Thu Sep 02 20:26:16 2010 +0300
@@ -19,6 +19,7 @@
 #define UT_INFOWIDGETLAYOUTMANAGER_H
 
 #include <QtTest/QtTest>
+#include <QGraphicsWidget>
 #include <mockservice.h>
 
 class InfoWidgetLayoutManager;
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -127,10 +127,10 @@
     QGraphicsWidget widget;
     
     bool loaded = true;
-    EXPECT(HbDocumentLoader::load)
+    EXPECT(HbDocumentLoader, load)
             .with(KInfoWidgetDocmlFile, loaded)
             .returns(&objectList);
-    EXPECT(HbDocumentLoader::findWidget).times(KNumOfInfoDisplayRoles).returns(&widget);
+    EXPECT(HbDocumentLoader, findWidget).times(KNumOfInfoDisplayRoles).returns(&widget);
     
     QGraphicsWidget *activeWidget = m_layoutManager->layoutInfoDisplay();
     
@@ -156,13 +156,13 @@
             InfoWidgetLayoutManager::RoleSatTextIcon));
     }
     
-    EXPECT(HbDocumentLoader::load)
+    EXPECT(HbDocumentLoader, load)
                 .with(KSettingsDialogDocmlFile, loaded)
                 .returns(&objectList);
-    EXPECT(HbDocumentLoader::findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
+    EXPECT(HbDocumentLoader, findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
     
     QObject action;
-    EXPECT(HbDocumentLoader::findObject).times(2).returns(&action);
+    EXPECT(HbDocumentLoader, findObject).times(2).returns(&action);
     
     activeWidget = m_layoutManager->layoutSettingsDialog();
     
@@ -181,11 +181,11 @@
 void UT_InfoWidgetLayoutManager::t_rowHeight()
 {
     bool b = false;
-    EXPECT(HbStyle::parameter).returns(b);
+    EXPECT(HbStyle, parameter).returns(b);
     m_layoutManager->layoutRowHeight();
     
     b = true;
-    EXPECT(HbStyle::parameter).returns(b);
+    EXPECT(HbStyle, parameter).returns(b);
     m_layoutManager->layoutRowHeight();
     
     QVERIFY(verify()); 
@@ -201,10 +201,10 @@
     QGraphicsWidget widget;
         
     bool loaded = true;
-    EXPECT(HbDocumentLoader::load)
+    EXPECT(HbDocumentLoader, load)
             .with(KInfoWidgetDocmlFile, loaded)
             .returns(&objectList);
-    EXPECT(HbDocumentLoader::findWidget).times(KNumOfInfoDisplayRoles).returns(&widget);
+    EXPECT(HbDocumentLoader, findWidget).times(KNumOfInfoDisplayRoles).returns(&widget);
     
     QVERIFY(m_layoutManager->layoutInfoDisplay());
 }
@@ -219,12 +219,12 @@
     QGraphicsWidget widget;
         
     bool loaded = true;
-    EXPECT(HbDocumentLoader::load)
+    EXPECT(HbDocumentLoader, load)
             .with(KSettingsDialogDocmlFile, loaded)
             .returns(&objectList);
-    EXPECT(HbDocumentLoader::findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
+    EXPECT(HbDocumentLoader, findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
     QObject action;
-    EXPECT(HbDocumentLoader::findObject).times(2).returns(&action);
+    EXPECT(HbDocumentLoader, findObject).times(2).returns(&action);
     
     QVERIFY(m_layoutManager->layoutSettingsDialog());
 }
@@ -282,12 +282,12 @@
     QObjectList objectList;
     QGraphicsWidget widget;
     bool loaded = true;
-    EXPECT(HbDocumentLoader::load)
+    EXPECT(HbDocumentLoader, load)
             .with(KSettingsDialogDocmlFile, loaded)
             .returns(&objectList);
     QObject action;
-    EXPECT(HbDocumentLoader::findObject).times(2).returns(&action);
-    EXPECT(HbDocumentLoader::findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
+    EXPECT(HbDocumentLoader, findObject).times(2).returns(&action);
+    EXPECT(HbDocumentLoader, findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
     bool loadResult = m_layoutManager->loadWidgets(InfoWidgetLayoutManager::SettingsDialog);
 
     QVERIFY(loadResult);
@@ -353,8 +353,8 @@
     QObject *cancelAction = new QObject; 
 
     // Test: 
-    EXPECT(HbDocumentLoader::findObject).with(QString("sd:cancelAction")).returns(cancelAction);
-    EXPECT(HbDocumentLoader::findObject).with(QString("sd:okAction")).returns(okAction);
+    EXPECT(HbDocumentLoader, findObject).with(QString("sd:cancelAction")).returns(cancelAction);
+    EXPECT(HbDocumentLoader, findObject).with(QString("sd:okAction")).returns(okAction);
     
     foreach(currentRole, objectRoles) {
         currentObject = m_layoutManager->loadObject(*m_documentLoader,
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -99,7 +99,7 @@
 
     // Ownership is transferred to InfoWidgetNetworkHandler
     CMyNWSession *session= new (ELeave)CMyNWSession(); 
-    EXPECT(CreateL).returns(session);;
+    expect("CreateL").returns(session);
     m_networkHandler =  new InfoWidgetNetworkHandler();
 
     m_networkHandler->m_nwInfo.iViagTextTag.Copy(KHomeZoneTextTag.utf16());
@@ -120,7 +120,7 @@
     reset();
     
     QVariant i(1);
-    EXPECT(XQSettingsManager::readItemValue).returns(i);  
+    EXPECT(XQSettingsManager, readItemValue).returns(i);  
     delete m_networkHandler;
     m_networkHandler = 0;
     
@@ -133,7 +133,7 @@
 void UT_InfoWidgetNetworkHandler::t_homeZoneTextTag()
 {
     QVariant i(1);
-    EXPECT(XQSettingsManager::readItemValue).returns(i);
+    EXPECT(XQSettingsManager, readItemValue).returns(i);
     
     QVERIFY(m_networkHandler->homeZoneTextTag() == KHomeZoneTextTag);
 }
@@ -390,8 +390,8 @@
 void UT_InfoWidgetNetworkHandler::t_createLeave()
 {
     QVariant i(1);
-    EXPECT(XQSettingsManager::readItemValue).returns(i);
-    EXPECT(CreateL)
+    EXPECT(XQSettingsManager, readItemValue).returns(i);
+    expect("CreateL")
             .willOnce(invokeWithoutArguments(this, &doLeaveL));
     
     EXPECT_EXCEPTION(InfoWidgetNetworkHandler * p = new InfoWidgetNetworkHandler(););
--- a/phoneplugins/phoneindicatorplugin/src/phoneindicatorservicesendertask.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneplugins/phoneindicatorplugin/src/phoneindicatorservicesendertask.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <xqaiwrequest.h>
 #include <xqappmgr.h>
-#include <logsservices.h>
+#include <xqaiwdecl.h>
 
 
 PhoneIndicatorServiceSenderTask::PhoneIndicatorServiceSenderTask(Interaction interaction):
@@ -44,11 +44,11 @@
     switch(m_interaction){
         case OpenMissedCallView:
             service = "logs";
-            interface = "com.nokia.symbian.ILogsView";
-            operation = "show(QVariantMap)";
-            map.insert("view_index",QVariant((int)LogsServices::ViewMissed));
-            map.insert("show_dialpad",QVariant(false));
-            map.insert("dialpad_text", QVariant(QString()));
+            interface = XQI_LOGS_VIEW;
+            operation = XQOP_LOGS_SHOW;
+            map.insert(XQLOGS_VIEW_INDEX, QVariant((int)XQService::LogsViewAll));
+            map.insert(XQLOGS_SHOW_DIALPAD, QVariant(false));
+            map.insert(XQLOGS_DIALPAD_TEXT , QVariant(QString()));
             args.append(QVariant(map));
             break;
         case OpenCallUi:            
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -101,7 +101,7 @@
     
     CPsetContainer &dummyContainer = reinterpret_cast<CPsetContainer &>(*this);
     m_barringWrapperMock = new PSetCallBarringWrapper(dummyContainer);
-    EXPECT(PSetWrapper::callBarringWrapper).returns(m_barringWrapperMock);
+    EXPECT(PSetWrapper, callBarringWrapper).returns(m_barringWrapperMock);
     
     CpItemDataHelper itemDataHelper;
     m_barringpluginGroup = new CpBarringPluginGroup(itemDataHelper);
@@ -152,7 +152,7 @@
  */
 void UT_CpBarringPluginGroup::t_itemShownNotBarringItem()
 {
-    EXPECT(PSetCallBarringWrapper::barringStatus).times(0);
+    EXPECT(PSetCallBarringWrapper, barringStatus).times(0);
     
     QScopedPointer<CpSettingFormItemData> item(new CpSettingFormItemData(
         HbDataFormModelItem::CheckBoxItem, hbTrId(""), NULL));
@@ -171,9 +171,9 @@
  */
 void UT_CpBarringPluginGroup::t_itemShownBarringStatusRequestOngoing()
 {
-    EXPECT(PSetCallBarringWrapper::barringStatus);
-    EXPECT(PsUiNotes::noteShowing).returns(true);
-    EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
+    EXPECT(PSetCallBarringWrapper, barringStatus);
+    EXPECT(PsUiNotes, noteShowing).returns(true);
+    EXPECT(PsUiNotes, showGlobalProgressNote).times(0);
     
     HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
     m_barringpluginGroup->itemShown(m_dataFormModel->indexFromItem(item));
@@ -202,16 +202,16 @@
     }
     
     // simulate barring enable request
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this).times(1);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
     
     // verify that already connected items are not enabled/connected again
-    EXPECT(CpItemDataHelper::removeConnection).times(1);
-    EXPECT(CpItemDataHelper::addConnection).times(1);
+    EXPECT(CpItemDataHelper, removeConnection).times(1);
+    EXPECT(CpItemDataHelper, addConnection).times(1);
     m_barringpluginGroup->barringStatusRequestCompleted(
         errorCode,
         basicServiceGroupIds, 
@@ -226,9 +226,9 @@
  */
 void UT_CpBarringPluginGroup::t_barringStatusRequestCompletedWithAnError()
 {
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showGlobalErrorNote);
-    EXPECT(CpItemDataHelper::addConnection).times(0);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showGlobalErrorNote);
+    EXPECT(CpItemDataHelper, addConnection).times(0);
     
     QList<unsigned char> basicServiceGroupIds;
     const int errorCode = -1;
@@ -252,24 +252,24 @@
 {
     qRegisterMetaType<QModelIndex>("QModelIndex");
     
-    EXPECT(PSetCallBarringWrapper::barringStatus)
+    EXPECT(PSetCallBarringWrapper, barringStatus)
         .with(ServiceGroupVoice, 
             PSetCallBarringWrapper::BarringTypeAllOutgoing);
-    EXPECT(PSetCallBarringWrapper::barringStatus)
+    EXPECT(PSetCallBarringWrapper, barringStatus)
         .with(ServiceGroupVoice, 
             PSetCallBarringWrapper::BarringTypeOutgoingInternational);
-    EXPECT(PSetCallBarringWrapper::barringStatus)
+    EXPECT(PSetCallBarringWrapper, barringStatus)
         .with(ServiceGroupVoice, 
             PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry);
-    EXPECT(PSetCallBarringWrapper::barringStatus)
+    EXPECT(PSetCallBarringWrapper, barringStatus)
         .with(ServiceGroupVoice, 
             PSetCallBarringWrapper::BarringTypeAllIncoming);
-    EXPECT(PSetCallBarringWrapper::barringStatus)
+    EXPECT(PSetCallBarringWrapper, barringStatus)
         .with(ServiceGroupVoice, 
             PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming);
-    EXPECT(PsUiNotes::showGlobalProgressNote)
+    EXPECT(PsUiNotes, showGlobalProgressNote)
         .willOnce(invoke(setNoteIdentifier));
-    EXPECT(CpItemDataHelper::addConnection).times(6);
+    EXPECT(CpItemDataHelper, addConnection).times(6);
     
     int numOfChilds = m_barringpluginGroup->childCount();
     for (int childIndex = 0; childIndex < numOfChilds; childIndex++) {
@@ -308,7 +308,7 @@
     
     // Verify that barring status checking is not started on item show if 
     // status is already queried.
-    EXPECT(PSetCallBarringWrapper::barringStatus).times(0);
+    EXPECT(PSetCallBarringWrapper, barringStatus).times(0);
     HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
     item->setContentWidgetData("checkState", QVariant(Qt::Checked));
     m_barringpluginGroup->itemShown(m_dataFormModel->indexFromItem(item));
@@ -323,11 +323,11 @@
 void UT_CpBarringPluginGroup::t_enableBarringRequestCompleted()
 {
 // request completed succesfully -case
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this).times(1);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -345,13 +345,13 @@
 // request completed with an error -case
     HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
     item->setContentWidgetData("checkState", QVariant(Qt::Checked));
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(CpItemDataHelper::removeConnection);
-    EXPECT(CpItemDataHelper::addConnection);
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showGlobalErrorNote);
+    EXPECT(CpItemDataHelper, removeConnection);
+    EXPECT(CpItemDataHelper, addConnection);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showGlobalErrorNote);
     
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -367,16 +367,16 @@
     
 // request completed successfully and dependent barring setting needs 
 // status inquiry
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
     // some other (outgoing) barring is enabled, status inquiery for that
     // should be done.
     item = m_barringpluginGroup->childAt(1);
     item->setContentWidgetData("checkState", QVariant(Qt::Checked));
-    EXPECT(PSetCallBarringWrapper::barringStatus);
-    EXPECT(PsUiNotes::cancelNote).times(0);
-    EXPECT(PsUiNotes::showGlobalNote).times(0);
+    EXPECT(PSetCallBarringWrapper, barringStatus);
+    EXPECT(PsUiNotes, cancelNote).times(0);
+    EXPECT(PsUiNotes, showGlobalNote).times(0);
     
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -405,14 +405,14 @@
     HbDataFormModelItem *item = m_barringpluginGroup->childAt(5);
     QModelIndex modelIndex = m_dataFormModel->indexFromItem(item);
     
-    EXPECT(CpItemDataHelper::widgetFromModelIndex)
-        .with<const QModelIndex &>(modelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex)
+        .with(modelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     // completion of unknown barring type should not lead to updating
-    EXPECT(PSetCallBarringWrapper::barringStatus).times(0);
+    EXPECT(PSetCallBarringWrapper, barringStatus).times(0);
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
@@ -439,16 +439,16 @@
     }
     
     QList<unsigned char> basicServiceGroupIds;
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
     
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeOutgoingInternational);
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry);
     m_barringpluginGroup->enableBarringRequestCompleted(
@@ -482,17 +482,17 @@
     }
     
     QList<unsigned char> basicServiceGroupIds;
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).with(modelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
     
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeAllOutgoing);
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry);
     m_barringpluginGroup->enableBarringRequestCompleted(
@@ -526,20 +526,20 @@
     }
     
     QList<unsigned char> basicServiceGroupIds;
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).with(modelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
     
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeAllOutgoing);
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeOutgoingInternational);
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry);
     m_barringpluginGroup->enableBarringRequestCompleted(
@@ -576,14 +576,14 @@
     }
     
     QList<unsigned char> basicServiceGroupIds;
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).with(modelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
     
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming);
     m_barringpluginGroup->enableBarringRequestCompleted(
@@ -614,14 +614,14 @@
     }
     
     QList<unsigned char> basicServiceGroupIds;
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).with(modelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
     emit simulateCheckStateChange(Qt::Checked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
     
-    EXPECT(PSetCallBarringWrapper::barringStatus).with(
+    EXPECT(PSetCallBarringWrapper, barringStatus).with(
         ServiceGroupVoice, 
         PSetCallBarringWrapper::BarringTypeAllIncoming);
     m_barringpluginGroup->enableBarringRequestCompleted(
@@ -642,11 +642,11 @@
 void UT_CpBarringPluginGroup::t_disableBarringRequestCompleted()
 {
 // request completed succesfully -case
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this).times(1);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     emit simulateCheckStateChange(Qt::Unchecked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
             KCurrentPassword, true);
@@ -662,13 +662,13 @@
 // request completed with an error -case
     HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
     item->setContentWidgetData("checkState", QVariant(Qt::Unchecked));
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(CpItemDataHelper::removeConnection);
-    EXPECT(CpItemDataHelper::addConnection);
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showGlobalErrorNote);
+    EXPECT(CpItemDataHelper, removeConnection);
+    EXPECT(CpItemDataHelper, addConnection);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showGlobalErrorNote);
     
     emit simulateCheckStateChange(Qt::Unchecked);
     m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -690,16 +690,16 @@
 void UT_CpBarringPluginGroup::t_barringPasswordChangeRequestCompleted()
 {
 // request completed with no error
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     
     m_barringpluginGroup->barringPasswordChangeRequestCompleted(0);
     
     QVERIFY(verify());
 
 // request completed with an error
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showGlobalErrorNote);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showGlobalErrorNote);
     
     m_barringpluginGroup->barringPasswordChangeRequestCompleted(-1);
     
@@ -713,13 +713,13 @@
 void UT_CpBarringPluginGroup::t_changeBarringStateRequested()
 {
 // barring enable request case
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PSetCallBarringWrapper::enableBarring)
+    EXPECT(PSetCallBarringWrapper, enableBarring)
         .with(ServiceGroupVoice, 
             PSetCallBarringWrapper::BarringTypeAllOutgoing, KCurrentPassword);
-    EXPECT(PsUiNotes::showGlobalProgressNote);
+    EXPECT(PsUiNotes, showGlobalProgressNote);
     
     HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
     item->setContentWidgetData("checkState", QVariant(Qt::Checked));
@@ -730,13 +730,13 @@
     QVERIFY(verify());
     
 // barring disable request case
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PSetCallBarringWrapper::disableBarring)
+    EXPECT(PSetCallBarringWrapper, disableBarring)
         .with(ServiceGroupVoice, 
             PSetCallBarringWrapper::BarringTypeAllOutgoing, KCurrentPassword);
-    EXPECT(PsUiNotes::showGlobalProgressNote);
+    EXPECT(PsUiNotes, showGlobalProgressNote);
     
     item = m_barringpluginGroup->childAt(0);
     item->setContentWidgetData("checkState", QVariant(Qt::Unchecked));
@@ -747,13 +747,13 @@
     QVERIFY(verify());
 
 // cancel pressed while querying barring password
-    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(CpItemDataHelper, widgetFromModelIndex).returns(this);
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setPasswordParamsCancel));
-    EXPECT(CpItemDataHelper::removeConnection);
-    EXPECT(CpItemDataHelper::addConnection);
-    EXPECT(PSetCallBarringWrapper::disableBarring).times(0);
-    EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
+    EXPECT(CpItemDataHelper, removeConnection);
+    EXPECT(CpItemDataHelper, addConnection);
+    EXPECT(PSetCallBarringWrapper, disableBarring).times(0);
+    EXPECT(PsUiNotes, showGlobalProgressNote).times(0);
     
     item = m_barringpluginGroup->childAt(0);
     item->setContentWidgetData("checkState", QVariant(Qt::Unchecked));
@@ -764,8 +764,8 @@
     QVERIFY(verify());
     
 // barring item not found case
-    EXPECT(PSetCallBarringWrapper::enableBarring).times(0);
-    EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
+    EXPECT(PSetCallBarringWrapper, enableBarring).times(0);
+    EXPECT(PsUiNotes, showGlobalProgressNote).times(0);
     
     emit simulateCheckStateChange(Qt::Checked);
     
@@ -783,16 +783,16 @@
         m_barringpluginGroup, SLOT(changeBarringPasswordRequested()));
     
     // cancel from current password query
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setPasswordParamsCancel));
     emit simulateEditPasswordButtonClicked(false);
     m_barringpluginGroup->changeBarringPasswordPhasesHandling("", false);
     QVERIFY(verify());
     
     // cancel from new password query
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setPasswordParamsCancel));
     emit simulateEditPasswordButtonClicked(false);
     m_barringpluginGroup->changeBarringPasswordPhasesHandling(
@@ -802,11 +802,11 @@
     QVERIFY(verify());
     
     // cancel from verify new password query
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setNewAndVerifiedPasswordParams));
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setPasswordParamsCancel));
     emit simulateEditPasswordButtonClicked(false);
     m_barringpluginGroup->changeBarringPasswordPhasesHandling(
@@ -818,13 +818,13 @@
     QVERIFY(verify());
     
     // all data successfully queried
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setCurrentPasswordParams));
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setNewAndVerifiedPasswordParams));
-    EXPECT(PsUiNotes::showPasswordQueryDialog)
+    EXPECT(PsUiNotes, showPasswordQueryDialog)
         .willOnce(invoke(setNewAndVerifiedPasswordParams));
-    EXPECT(PSetCallBarringWrapper::changeBarringPassword)
+    EXPECT(PSetCallBarringWrapper, changeBarringPassword)
         .with(KCurrentPassword, KNewAndVerifiedPassword, KNewAndVerifiedPassword);
     emit simulateEditPasswordButtonClicked(false);
     m_barringpluginGroup->changeBarringPasswordPhasesHandling(
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -14,10 +14,6 @@
 # Description: Project file for building unit test component
 #
 
-
-
-
-
 CONFIG += qtestlib hb
 TEMPLATE = app
 TARGET = 
@@ -25,6 +21,8 @@
 INCLUDEPATH += .
 INCLUDEPATH += ../../../inc
 INCLUDEPATH += ../../../cptelephonyutils/inc
+INCLUDEPATH += ../../../tsrc/common
+
 DEFINES += BUILD_CPTELEPHONYUTILS BUILD_BARRINGPLUGIN \
            BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
 DEFINES += QT_NO_DEBUG_STREAM
@@ -54,18 +52,22 @@
            ../../../cptelephonyutils/inc/cpplugincommon.h \
            /epoc32/include/platform/mw/psetwrapper.h \
            /epoc32/include/platform/mw/psuinotes.h \
-           /epoc32/include/platform/mw/psetcliwrapper.h \
-           /epoc32/include/platform/mw/sssettingswrapper.h \
+           /epoc32/include/platform/mw/psetcallbarringwrapper.h \
+           /epoc32/include/platform/mw/psetcalldivertingwrapper.h \
            /epoc32/include/platform/mw/psetcallwaitingwrapper.h \
-           /epoc32/include/platform/mw/psetcalldivertingwrapper.h \
+           /epoc32/include/platform/mw/psetcliwrapper.h \
            /epoc32/include/platform/mw/psetnetworkwrapper.h \
-           /epoc32/include/platform/mw/psetcallbarringwrapper.h
+           #/epoc32/include/platform/mw/sssettingswrapper.h \
 
 SOURCES += ../../src/cpbarringplugingroup.cpp
 
 # mocks needed for testing
 SOURCES += ../../../tsrc/mocks/mock_cpbarringplugin.cpp
 SOURCES += ../../../tsrc/mocks/mock_psetcallbarringwrapper.cpp
+SOURCES += ../../../tsrc/mocks/mock_psetcalldivertingwrapper.cpp
+SOURCES += ../../../tsrc/mocks/mock_psetcallwaitingwrapper.cpp
+SOURCES += ../../../tsrc/mocks/mock_psetcliwrapper.cpp
+SOURCES += ../../../tsrc/mocks/mock_psetnetworkwrapper.cpp
 SOURCES += ../../../tsrc/mocks/mock_psetwrapper.cpp
 SOURCES += ../../../tsrc/mocks/mock_psuinotes.cpp
 SOURCES += ../../../tsrc/mocks/mock_cpplugincommon.cpp
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/ut_cpbarringplugin.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/ut_cpbarringplugin.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -22,6 +22,7 @@
 INCLUDEPATH += .
 INCLUDEPATH +=../../../inc 
 INCLUDEPATH +=../../../cptelephonyutils/inc
+INCLUDEPATH += ../../../tsrc/common
 DEFINES += BUILD_BARRINGPLUGIN
 
 QT -= gui
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/ut_callsplugin.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/ut_callsplugin.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -22,6 +22,7 @@
 INCLUDEPATH += .
 INCLUDEPATH +=../../../inc 
 INCLUDEPATH +=../../../cptelephonyutils/inc
+INCLUDEPATH += ../../../tsrc/common
 DEFINES += BUILD_CALLSPLUGIN 
 
 QT -= gui
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -63,7 +63,7 @@
     CPsetContainer cont;
     PSetCallWaitingWrapper waitingWrapper(cont);
     
-    EXPECT(PSetWrapper::callWaitingWrapper).returns(&waitingWrapper);
+    EXPECT(PSetWrapper, callWaitingWrapper).returns(&waitingWrapper);
     
     static bool b=0;//CenrepKeyValueOff;
     if (b==0) {
@@ -71,7 +71,7 @@
     } else {
         b=0;
     }
-    EXPECT(CpSettingsWrapper::showCallDuration).returns(b);
+    EXPECT(CpSettingsWrapper, showCallDuration).returns(b);
     
     static int i=0;//No Errors
     if (i==0) {
@@ -79,14 +79,13 @@
     } else {
         i=0;
     }
-    EXPECT(SsSettingsWrapper::get).returns(i); 
+    EXPECT(SsSettingsWrapper, get).returns(i); 
     
-    EXPECT(CpSettingsWrapper::readSoftRejectText);
+    EXPECT(CpSettingsWrapper, readSoftRejectText);
 
     if (qstrcmp(QTest::currentTestFunction(), 
         "t_handleCallWaitingGetStatusDistinguishEnabled") == 0) {
-        EXPECT(
-            CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled)
+        EXPECT(CpSettingsWrapper, isFeatureCallWaitingDistiquishNotProvisionedEnabled)
             .returns(true);
     }
     
@@ -102,18 +101,18 @@
     bool bOngoing=true;
     bool bDuration=true;
     
-    EXPECT(CpSettingsWrapper::isOngoingCall).returns(bOngoing);
-    EXPECT(CpSettingsWrapper::showCallDuration).returns(bDuration);
-    EXPECT(PsUiNotes::showGlobalNote);
+    EXPECT(CpSettingsWrapper, isOngoingCall).returns(bOngoing);
+    EXPECT(CpSettingsWrapper, showCallDuration).returns(bDuration);
+    EXPECT(PsUiNotes, showGlobalNote);
     m_callspluginGroup->showCallDurationStateChanged();
     
     bDuration = false;
-    EXPECT(CpSettingsWrapper::isOngoingCall).returns(bOngoing);
-    EXPECT(CpSettingsWrapper::showCallDuration).returns(bDuration);
+    EXPECT(CpSettingsWrapper, isOngoingCall).returns(bOngoing);
+    EXPECT(CpSettingsWrapper, showCallDuration).returns(bDuration);
     m_callspluginGroup->showCallDurationStateChanged();
     
     bOngoing = false;
-    EXPECT(CpSettingsWrapper::isOngoingCall).returns(bOngoing);
+    EXPECT(CpSettingsWrapper, isOngoingCall).returns(bOngoing);
     m_callspluginGroup->showCallDurationStateChanged();
     
     QVERIFY(verify());
@@ -127,19 +126,19 @@
     QList<unsigned char> basicServiceGroupIds;
 
     // check status case
-    EXPECT(PSetCallWaitingWrapper::getCallWaitingStatus);
+    EXPECT(PSetCallWaitingWrapper, getCallWaitingStatus);
     m_callspluginGroup->callWaitingCurrentIndexChanged();
 
     // active case
     m_callspluginGroup->handleCallWaitingGetStatus(
         PSetCallWaitingWrapper::StatusActive, basicServiceGroupIds);
-    EXPECT(PSetCallWaitingWrapper::setCallWaiting);
+    EXPECT(PSetCallWaitingWrapper, setCallWaiting);
     m_callspluginGroup->callWaitingCurrentIndexChanged();
 
     // deactive case
     m_callspluginGroup->handleCallWaitingGetStatus(
         PSetCallWaitingWrapper::StatusDisabled, basicServiceGroupIds);
-    EXPECT(PSetCallWaitingWrapper::setCallWaiting);
+    EXPECT(PSetCallWaitingWrapper, setCallWaiting);
     m_callspluginGroup->callWaitingCurrentIndexChanged();
 
     QVERIFY(verify());
@@ -150,14 +149,14 @@
  */
 void UT_CpCallsPluginGroup::t_cliCurrentIndexChanged()
 {
-    EXPECT(SsSettingsWrapper::set);
+    EXPECT(SsSettingsWrapper, set);
     m_callspluginGroup->cliCurrentIndexChanged(1);
     
     QVERIFY(verify());
     reset();
     
     //Do nothing, index is out of range
-    EXPECT(PSetCallWaitingWrapper::setCallWaiting).times(0);
+    EXPECT(PSetCallWaitingWrapper, setCallWaiting).times(0);
     m_callspluginGroup->cliCurrentIndexChanged(-1);
     
     QVERIFY(verify());
@@ -168,23 +167,23 @@
  */
 void UT_CpCallsPluginGroup::t_handleCallWaitingChanged()
 {
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::ActivateCallWaiting , 0);
     
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::DeactivateCallWaiting, 0);
     
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::CheckCallWaitingStatus, 0);
     
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::DeactivateCallWaiting , -1);
     
@@ -196,21 +195,21 @@
  */
 void UT_CpCallsPluginGroup::t_handleCallWaitingRequesting()
 {
-    EXPECT(PsUiNotes::cancelNote);
+    EXPECT(PsUiNotes, cancelNote);
     m_callspluginGroup->handleCallWaitingRequesting( false, true ); 
     
-    EXPECT(PsUiNotes::showGlobalProgressNote);
+    EXPECT(PsUiNotes, showGlobalProgressNote);
     m_callspluginGroup->handleCallWaitingRequesting( true, false );
     
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showGlobalProgressNote);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showGlobalProgressNote);
 //    m_callspluginGroup->handleCallWaitingRequesting( true, true );
 
 //    QVERIFY(verify());
     reset();
     
-    EXPECT(PsUiNotes::cancelNote).times(0);
-    EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
+    EXPECT(PsUiNotes, cancelNote).times(0);
+    EXPECT(PsUiNotes, showGlobalProgressNote).times(0);
     m_callspluginGroup->handleCallWaitingRequesting( false, false );
     
     QVERIFY(verify());
@@ -221,8 +220,8 @@
  */
 void UT_CpCallsPluginGroup::t_handleCallWaitingError()
 {
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showGlobalErrorNote);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showGlobalErrorNote);
     m_callspluginGroup->handleCallWaitingError( -1 );
     
     QVERIFY(verify());
@@ -234,7 +233,7 @@
 void UT_CpCallsPluginGroup::t_softRejectTextChanged()
 {
     int iRet=0;
-    EXPECT(CpSettingsWrapper::writeSoftRejectText).returns(iRet);
+    EXPECT(CpSettingsWrapper, writeSoftRejectText).returns(iRet);
     m_callspluginGroup->softRejectTextChanged();
     
     QVERIFY(verify());
@@ -247,11 +246,11 @@
 {
     QList<unsigned char> basicServiceGroupIds;
     
-    EXPECT(PsUiNotes::cancelNote);
+    EXPECT(PsUiNotes, cancelNote);
     m_callspluginGroup->handleCallWaitingGetStatus(
         PSetCallWaitingWrapper::StatusNotProvisioned, basicServiceGroupIds);
     
-    EXPECT(PsUiNotes::cancelNote);
+    EXPECT(PsUiNotes, cancelNote);
     m_callspluginGroup->handleCallWaitingGetStatus(
         PSetCallWaitingWrapper::StatusActive, basicServiceGroupIds);
     QVERIFY(verify());
@@ -264,8 +263,8 @@
 {
     QList<unsigned char> basicServiceGroupIds;
     
-    EXPECT(PsUiNotes::cancelNote);
-    EXPECT(PsUiNotes::showNotificationDialog);
+    EXPECT(PsUiNotes, cancelNote);
+    EXPECT(PsUiNotes, showNotificationDialog);
     m_callspluginGroup->handleCallWaitingGetStatus(
         PSetCallWaitingWrapper::StatusNotProvisioned, basicServiceGroupIds);
     
@@ -277,7 +276,7 @@
  */
 void UT_CpCallsPluginGroup::t_ownVideoInReceivedCallStateChanged()
 {
-    EXPECT(CpSettingsWrapper::writeVtVideoSending).times(3);
+    EXPECT(CpSettingsWrapper, writeVtVideoSending).times(3);
     m_callspluginGroup->ownVideoInReceivedCallStateChanged(0);
     m_callspluginGroup->ownVideoInReceivedCallStateChanged(1);
     m_callspluginGroup->ownVideoInReceivedCallStateChanged(2);
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -14,10 +14,6 @@
 # Description: Project file for building unit test component
 #
 
-
-
-
-
 CONFIG += qtestlib hb
 TEMPLATE = app
 TARGET = 
@@ -26,7 +22,7 @@
 INCLUDEPATH += ../../../inc
 INCLUDEPATH += ../../../cptelephonyutils/inc
 INCLUDEPATH += /sf/mw/phonesrv/cellular/telephonysettings/xqbindings/psetwrapper/src
-
+INCLUDEPATH += ../../../tsrc/common
 
 DEFINES += BUILD_CALLSPLUGIN BUILD_CPTELEPHONYUTILS \
            BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
@@ -72,6 +68,4 @@
            ../../../tsrc/mocks/mock_psetcliwrapper.cpp \
            ../../../tsrc/mocks/mock_psetnetworkwrapper.cpp \
            ../../../tsrc/mocks/mock_psetwrapper.cpp \
-           ../../../tsrc/mocks/mock_sssettingswrapper.cpp \
-           ../../../tsrc/mocks/mock_psetcliwrapper_p.cpp \
-           ../../../tsrc/mocks/mock_psetcallwaitingwrapper_p.cpp
+           ../../../tsrc/mocks/mock_sssettingswrapper.cpp
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -42,7 +42,8 @@
     m_pSetWrapper(NULL),
     m_cpSettingsWrapper(NULL),
     mCellularSettings(),
-    m_dialog(NULL)
+    m_dialog(NULL),
+    m_NetworkOperatorSelectionItemData(NULL)
 {
     DPRINT << ": IN";
     
@@ -51,9 +52,7 @@
     QScopedPointer<PSetWrapper> pSetWrapperGuard(new PSetWrapper);
     m_psetNetworkWrapper = &pSetWrapperGuard->networkWrapper();
     mCellularSettings = QSharedPointer<CellularDataSettings>(new CellularDataSettings);
-    connectToNetworkWrapper(*m_psetNetworkWrapper);
-    connectToPhoneNotes(*PsUiNotes::instance());
-    
+        
     QScopedPointer<HbDataFormModel> model(new HbDataFormModel);
     QScopedPointer<CpSettingsWrapper> cpSettingsWrapperGuard(new CpSettingsWrapper);
 
@@ -70,6 +69,9 @@
     setModel(model.take());
     m_pSetWrapper = pSetWrapperGuard.take();
     m_cpSettingsWrapper = cpSettingsWrapperGuard.take();
+    
+    connectToNetworkWrapper(*m_psetNetworkWrapper);
+    connectToPhoneNotes(*PsUiNotes::instance());
 
     DPRINT << ": OUT";
 }
@@ -886,6 +888,13 @@
         SLOT(handleNetworkChanged(
             PSetNetworkWrapper::NetworkInfo&, 
             PSetNetworkWrapper::RegistrationStatus&)));
+    
+    QObject::connect(
+        &wrapper, 
+        SIGNAL(chageVisbilityOfManualNetworkSelection(bool)),
+        this, 
+        SLOT(chageVisbilityOfManualNetworkSelection(bool)));
+    
 }
 
 
@@ -928,4 +937,29 @@
     DPRINT << ": OUT";
 }
 
+/*!
+  CpNetworkPluginForm::chageVisbilityOfManualNetworkSelection
+  */
+void CpNetworkPluginForm::chageVisbilityOfManualNetworkSelection(bool visible)
+{
+    DPRINT << ": IN : visible " << visible;
+    
+    HbDataFormModel* formModel = qobject_cast<HbDataFormModel*>(model());
+    if (formModel) {
+        if (visible && !m_NetworkOperatorSelectionItemData) {
+            formModel->appendDataFormItem(createOperatorSelectionItem());
+        } else if (!visible && m_NetworkOperatorSelectionItemData) {
+            removeConnection(
+                m_NetworkOperatorSelectionItemData, 
+                SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
+                this, 
+                SLOT(operatorSelectionStateChanged()));
+            formModel->removeItem(m_NetworkOperatorSelectionItemData);
+            m_NetworkOperatorSelectionItemData = NULL;
+        }
+    }
+    
+    DPRINT << ": OUT";
+}
+
 // End of File. 
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h	Thu Sep 02 20:26:16 2010 +0300
@@ -67,6 +67,7 @@
         PSetNetworkWrapper::NetworkInfo& currentInfo,
         PSetNetworkWrapper::RegistrationStatus& status);
     void finishedManualSelectiondialog(HbAction* action);
+    void chageVisbilityOfManualNetworkSelection(bool visible);
 
 protected:     
     HbDataFormModelItem *createNetworkModeItem();
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cellulardatasettings/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cellulardatasettings/ut_cellulardatasettings.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cellulardatasettings/ut_cellulardatasettings.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -22,6 +22,7 @@
 INCLUDEPATH += .
 INCLUDEPATH +=../../../inc 
 INCLUDEPATH +=../../../cptelephonyutils/inc
+INCLUDEPATH += ../../../tsrc/common
 
 QT -= gui
 QT += testlib
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -80,8 +80,8 @@
     CpNetworkPlugin* p = (CpNetworkPlugin*)qt_plugin_instance();
     QList<CpSettingFormItemData*> list;
     
-    EXPECT(CpNetworkStatus::statusText);
-    EXPECT(CpNetworkStatus::statusIcon);
+    EXPECT(CpNetworkStatus, statusText);
+    EXPECT(CpNetworkStatus, statusIcon);
     list.append(p->createSettingFormItemData(itemDataHelper));
     qDeleteAll(list);
     
@@ -97,7 +97,7 @@
     CpNetworkPlugin* p = (CpNetworkPlugin*)qt_plugin_instance();
     QVariant hint;
     
-    EXPECT(CpNetworkStatus::statusText);
+    EXPECT(CpNetworkStatus, statusText);
     CpBaseSettingView *view = p->createSettingView(hint);
     delete view;
     
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -22,6 +22,7 @@
 INCLUDEPATH += .
 INCLUDEPATH +=../../../inc 
 INCLUDEPATH +=../../../cptelephonyutils/inc
+INCLUDEPATH += ../../../tsrc/common
 DEFINES += BUILD_CPTELEPHONYUTILS
 
 QT -= gui
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -59,6 +59,9 @@
 # mocks needed for testing
 SOURCES += ../../../tsrc/mocks/mock_cpnetworkplugin.cpp \
            ../../../tsrc/mocks/mock_psetwrapper.cpp \
+           ../../../tsrc/mocks/mock_psetcalldivertingwrapper.cpp \
+           ../../../tsrc/mocks/mock_psetcallwaitingwrapper.cpp \
+           ../../../tsrc/mocks/mock_psetcliwrapper.cpp \
            ../../../tsrc/mocks/mock_psetnetworkwrapper.cpp \
            ../../../tsrc/mocks/mock_cpplugincommon.cpp \
            ../../../tsrc/mocks/mock_psuinotes.cpp \
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -79,6 +79,37 @@
 
 
 /*!
+  UT_CpNetworkPluginForm::cleanup
+ */
+void UT_CpNetworkPluginForm::cleanup()
+{
+    reset();
+    delete m_networkPluginForm;
+    m_networkPluginForm = NULL;
+    delete m_networkWrapper;
+    m_networkWrapper = NULL;
+}
+
+
+/*!
+  UT_CpNetworkPluginForm::updateNetworkSelectionMode
+ */
+void UT_CpNetworkPluginForm::updateNetworkSelectionMode(
+    PSetNetworkWrapper::NetworkSelectionMode& mode)
+{
+    mode = m_NetworkSelectionMode;
+}
+
+/*!
+  UT_CpNetworkPluginForm::t_memleak
+ */
+void UT_CpNetworkPluginForm::t_memleak()
+{
+    
+}
+
+
+/*!
   UT_CpNetworkPluginForm::t_networkModeStateChanged
  */
 void UT_CpNetworkPluginForm::t_networkModeStateChanged()
@@ -93,7 +124,7 @@
     m_networkPluginForm->networkModeStateChanged(2);
     
     expect("CpSettingsWrapper::isPhoneOffline").returns(false);
-        m_networkPluginForm->networkModeStateChanged(3);
+    m_networkPluginForm->networkModeStateChanged(3);
     
     expect("CpSettingsWrapper::isPhoneOffline").returns(true);
     m_networkPluginForm->networkModeStateChanged(0);
@@ -303,32 +334,17 @@
 }
 
 /*!
-  UT_CpNetworkPluginForm::cleanup
+  UT_CpNetworkPluginForm::t_chageVisbilityOfManualNetworkSelection
  */
-void UT_CpNetworkPluginForm::cleanup()
+void UT_CpNetworkPluginForm::t_chageVisbilityOfManualNetworkSelection()
 {
-    reset();
-    delete m_networkPluginForm;
-    m_networkPluginForm = NULL;
-    delete m_networkWrapper;
-    m_networkWrapper = NULL;
-}
-
-/*!
-  UT_CpNetworkPluginForm::t_memleak
- */
-void UT_CpNetworkPluginForm::t_memleak()
-{
+    m_networkPluginForm->chageVisbilityOfManualNetworkSelection(false);
+        
+    m_networkPluginForm->chageVisbilityOfManualNetworkSelection(false);
+        
+    m_networkPluginForm->chageVisbilityOfManualNetworkSelection(true);
     
-}
-
-/*!
-  UT_CpNetworkPluginForm::updateNetworkSelectionMode
- */
-void UT_CpNetworkPluginForm::updateNetworkSelectionMode(
-    PSetNetworkWrapper::NetworkSelectionMode& mode)
-{
-    mode = m_NetworkSelectionMode;
+    m_networkPluginForm->chageVisbilityOfManualNetworkSelection(true);
 }
 
 
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.h	Thu Sep 02 20:26:16 2010 +0300
@@ -55,11 +55,13 @@
 private slots:
 
     void init();
+    void cleanup();
 
+    void t_memleak();
+    
     void t_networkModeStateChanged();
     void t_operatorSelectionStateChanged();
     void t_networkAccessModeGot();
-    
     void t_availableNetworksGot();
     void t_networkReqestFailed();
     void t_userCancel();
@@ -67,10 +69,7 @@
     void t_handleRequestingSelectedNetwork();
     void t_handleNetworkChanged();
     void t_primaryIconForNetwork();
-    
-    void cleanup();
-    
-    void t_memleak();
+    void t_chageVisbilityOfManualNetworkSelection();
 
 private:
     CpNetworkPluginForm *m_networkPluginForm;
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -73,34 +73,34 @@
  */
 void ut_CpNetworkStatus::t_statusText()
 {
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::GsmMode );
-    EXPECT( QtMobility::QSystemDeviceInfo::simStatus );
-    EXPECT( QtMobility::QSystemDeviceInfo::currentProfile );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkName );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::GsmMode );
+    EXPECT( QtMobility::QSystemDeviceInfo, simStatus );
+    EXPECT( QtMobility::QSystemDeviceInfo, currentProfile );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkName );
     m_networkStatus->statusText();
     QVERIFY(verify());
     
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::GsmMode );
-    EXPECT( QtMobility::QSystemDeviceInfo::simStatus );
-    EXPECT( QtMobility::QSystemDeviceInfo::currentProfile );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkName );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::GsmMode );
+    EXPECT( QtMobility::QSystemDeviceInfo, simStatus );
+    EXPECT( QtMobility::QSystemDeviceInfo, currentProfile );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkName );
     QT_TRAP_THROWING(SmcDefaultValue<QString>::SetL(QString("")));
     m_networkStatus->statusText();
     QVERIFY(verify());
     
-    EXPECT( QtMobility::QSystemDeviceInfo::simStatus );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkName ).times(0);
+    EXPECT( QtMobility::QSystemDeviceInfo, simStatus );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkName ).times(0);
     QT_TRAP_THROWING(SmcDefaultValue< QSystemDeviceInfo::SimStatus >::SetL(QSystemDeviceInfo::SimNotAvailable ));
     m_networkStatus->statusText();
     QVERIFY(verify());
     
-    EXPECT( QtMobility::QSystemDeviceInfo::simStatus );
-    EXPECT( QtMobility::QSystemDeviceInfo::currentProfile );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::GsmMode );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkName ).times(0);
+    EXPECT( QtMobility::QSystemDeviceInfo, simStatus );
+    EXPECT( QtMobility::QSystemDeviceInfo, currentProfile );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::GsmMode );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkName ).times(0);
     QT_TRAP_THROWING(SmcDefaultValue< QSystemDeviceInfo::SimStatus >::SetL(QSystemDeviceInfo::SingleSimAvailable ));
     QT_TRAP_THROWING(SmcDefaultValue< QSystemNetworkInfo::NetworkStatus >::SetL(QSystemNetworkInfo::NoNetworkAvailable));
     m_networkStatus->statusText();
@@ -112,22 +112,22 @@
  */
 void ut_CpNetworkStatus::t_statusIcon()
 {
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::GsmMode );
-    EXPECT( QtMobility::QSystemDeviceInfo::simStatus );
-    EXPECT( QtMobility::QSystemDeviceInfo::currentProfile );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::GsmMode );
+    EXPECT( QtMobility::QSystemDeviceInfo, simStatus );
+    EXPECT( QtMobility::QSystemDeviceInfo, currentProfile );
     m_networkStatus->statusIcon();
     QVERIFY(verify());
     
-    EXPECT( QtMobility::QSystemDeviceInfo::simStatus );
+    EXPECT( QtMobility::QSystemDeviceInfo, simStatus );
     QT_TRAP_THROWING(SmcDefaultValue< QSystemDeviceInfo::SimStatus >::SetL(QSystemDeviceInfo::SimNotAvailable ));
     m_networkStatus->statusIcon();
     QVERIFY(verify());
     
-    EXPECT( QtMobility::QSystemDeviceInfo::simStatus );
-    EXPECT( QtMobility::QSystemDeviceInfo::currentProfile );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
-    EXPECT( QtMobility::QSystemNetworkInfo::networkStatus ).with ( QSystemNetworkInfo::GsmMode );
+    EXPECT( QtMobility::QSystemDeviceInfo, simStatus );
+    EXPECT( QtMobility::QSystemDeviceInfo, currentProfile );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::WcdmaMode );
+    EXPECT( QtMobility::QSystemNetworkInfo, networkStatus ).with ( QSystemNetworkInfo::GsmMode );
     QT_TRAP_THROWING(SmcDefaultValue< QSystemDeviceInfo::SimStatus >::SetL(QSystemDeviceInfo::SingleSimAvailable ));
     QT_TRAP_THROWING(SmcDefaultValue< QSystemNetworkInfo::NetworkStatus >::SetL(QSystemNetworkInfo::NoNetworkAvailable));
     m_networkStatus->statusIcon();
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -22,6 +22,7 @@
 INCLUDEPATH += .
 INCLUDEPATH +=../../../inc 
 INCLUDEPATH +=../../../cptelephonyutils/inc
+INCLUDEPATH += ../../../tsrc/common
 DEFINES += BUILD_NETWORKPLUGIN BUILD_CPTELEPHONYUTILS QT_BUILD_SYSINFO_LIB QT_MAKEDLL
 MOBILITY += systeminfo
 
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -271,7 +271,11 @@
 
 bool CpSettingsWrapper::isPhoneOffline() const
 {
-    return QSystemDeviceInfo::OfflineProfile == m_deviceInfo->currentProfile();
+    bool networkConnectionAllowed = readCenrepValue(KCRUidCoreApplicationUIs.iUid,
+                                KCoreAppUIsNetworkConnectionAllowed).toBool();
+    // 0 = Offline Mode, 1 = Online Mode
+    DPRINT << "networkConnectionAllowed: " << networkConnectionAllowed;
+    return !networkConnectionAllowed;
 }
 
 bool CpSettingsWrapper::isOngoingCall() const
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -20,6 +20,7 @@
 TARGET = 
 DEPENDPATH += . ../../src/
 INCLUDEPATH += . ../../inc/
+INCLUDEPATH += ../../../tsrc/common
 DEFINES += BUILD_CPTELEPHONYUTILS 
     
 QT -= gui
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/qtestmains60.h	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -75,7 +75,7 @@
  */
 void UT_CpPluginCommon::t_showCallDuration()
 {
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
         returns(QVariant(23324));
     
     mWrapper->showCallDuration();
@@ -99,18 +99,18 @@
 {
     QString text="";
     bool userDefined=true;
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
             returns(QVariant(true));
     
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
             returns(QVariant("text"));
     
     mWrapper->readSoftRejectText(text, userDefined);
     
     userDefined=false;
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
                     returns(QVariant(false));
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
             returns(QVariant("text"));
     mWrapper->readSoftRejectText(text, userDefined);
     
@@ -135,7 +135,7 @@
  */
 void UT_CpPluginCommon::t_numberGroupingSupported()
 {
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
             returns(QVariant(true));
     
     mWrapper->numberGroupingSupported();
@@ -148,10 +148,10 @@
 
 void UT_CpPluginCommon::t_voipSupported()
 {
-    EXPECT(XQSysInfo::isSupported).with(
+    EXPECT(XQSysInfo, isSupported).with(
             KFeatureIdCommonVoip).returns(false);
     QCOMPARE( Tools::voipSupported(), false );
-    EXPECT(XQSysInfo::isSupported).with(
+    EXPECT(XQSysInfo, isSupported).with(
             KFeatureIdCommonVoip).returns(true);
     QCOMPARE( Tools::voipSupported(), true );
     
@@ -163,10 +163,10 @@
  */
 void UT_CpPluginCommon::t_videoSupported()
 {
-    EXPECT(XQSysInfo::isSupported).with(
+    EXPECT(XQSysInfo, isSupported).with(
             KFeatureIdCsVideoTelephony).returns(true);
     QCOMPARE( Tools::videoSupported(), true );
-    EXPECT(XQSysInfo::isSupported).with(
+    EXPECT(XQSysInfo, isSupported).with(
             KFeatureIdCsVideoTelephony).returns(false);
     QCOMPARE( Tools::videoSupported(), false );
     
@@ -236,21 +236,21 @@
     Tools::errorCodeTextMapping(KErrGsmSSUnknownAlphabet, text);
     QCOMPARE( text, QString("txt_phone_info_invalid_phone_number"));
     
-    EXPECT(XQSysInfo::isSupported).returns(false);
+    EXPECT(XQSysInfo, isSupported).returns(false);
     Tools::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text);
     QCOMPARE( text, QString(
             "txt_phone_info_request_not_completed"));
     QVERIFY( verify() );
     
-    EXPECT(XQSysInfo::isSupported).returns(true);
-    EXPECT(XQSettingsManager::readItemValue).returns(QVariant(EBTSapConnected));
+    EXPECT(XQSysInfo, isSupported).returns(true);
+    EXPECT(XQSettingsManager, readItemValue).returns(QVariant(EBTSapConnected));
     Tools::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text);
     QCOMPARE( text, QString(
             "Operation not possible in SIM access profile mode"));
     QVERIFY( verify() );
     
-    EXPECT(XQSysInfo::isSupported).returns(true);
-    EXPECT(XQSettingsManager::readItemValue).returns(QVariant(EBTSapNotConnected));
+    EXPECT(XQSysInfo, isSupported).returns(true);
+    EXPECT(XQSettingsManager, readItemValue).returns(QVariant(EBTSapNotConnected));
     Tools::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text);
     QCOMPARE( text, QString(
             "Operation not possible in Off-line mode"));
@@ -268,7 +268,7 @@
  */
 void UT_CpPluginCommon::t_readVtVideoSending()
 {
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
             returns(QVariant(1));
     mWrapper->readVtVideoSending();
     QVERIFY( verify() );
@@ -279,7 +279,7 @@
  */
 void UT_CpPluginCommon::t_writeVtVideoSending()
 {
-    EXPECT(XQSettingsManager::writeItemValue);//.
+    EXPECT(XQSettingsManager, writeItemValue);//.
             //times(2);
     int i=0;
     mWrapper->writeVtVideoSending(i);
@@ -291,7 +291,7 @@
  */
 void UT_CpPluginCommon::t_isFeatureCallWaitingDistiquishNotProvisionedEnabled()
 {
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
                 returns(QVariant(1));
     mWrapper->isFeatureCallWaitingDistiquishNotProvisionedEnabled();
     QVERIFY( verify() );
@@ -302,16 +302,10 @@
  */
 void UT_CpPluginCommon::t_isPhoneOffline()
 {
-    EXPECT(QtMobility::QSystemDeviceInfo::currentProfile)
-        .returns(QSystemDeviceInfo::NormalProfile);
-    bool isOffline = mWrapper->isPhoneOffline();
-    QCOMPARE(isOffline, false);
-    QVERIFY(verify());
-    
-    EXPECT(QtMobility::QSystemDeviceInfo::currentProfile)
-        .returns(QSystemDeviceInfo::OfflineProfile);
-    isOffline = mWrapper->isPhoneOffline();
-    QCOMPARE(isOffline, true);
+    EXPECT(XQSettingsManager, readItemValue).
+                returns(QVariant(1));
+     mWrapper->isPhoneOffline();
+
     QVERIFY(verify());
 }
 
@@ -320,7 +314,7 @@
  */
 void UT_CpPluginCommon::t_isOngoingCall()
 {
-    EXPECT(XQSettingsManager::readItemValue).
+    EXPECT(XQSettingsManager, readItemValue).
                     returns(QVariant(1));
     mWrapper->isOngoingCall();
     QVERIFY( verify() );
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -20,6 +20,7 @@
 TARGET = 
 DEPENDPATH += . ../../src/
 INCLUDEPATH += . ../../inc/
+INCLUDEPATH += ../../../tsrc/common
 DEFINES += BUILD_CPTELEPHONYUTILS \
     XQSETTINGSMANAGER_NO_LIBRARY \
     XQSYSINFO_NO_LIBRARY \
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -58,6 +58,9 @@
 
 # mocks needed for testing
 SOURCES += ../../../tsrc/mocks/mock_psetcalldivertingwrapper.cpp \
+           ../../../tsrc/mocks/mock_psetcallwaitingwrapper.cpp \
+           ../../../tsrc/mocks/mock_psetcliwrapper.cpp \
+           ../../../tsrc/mocks/mock_psetnetworkwrapper.cpp \
            ../../../tsrc/mocks/mock_sssettingswrapper.cpp \
            ../../../tsrc/mocks/mock_cpplugincommon.cpp \
            ../../../tsrc/mocks/mock_psuinotes.cpp \
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -50,7 +50,7 @@
     
     HbDataForm *form = qobject_cast<HbDataForm*>(widget());
     if (form) {
-        HbDataFormModel *model = new HbDataFormModel;
+        HbDataFormModel *model = new HbDataFormModel(form);
         form->setHeading(hbTrId("txt_phone_subhead_telephone"));
         // Create and initialize plugin's item data helper
         m_helper = initializeItemDataHelper(); 
@@ -135,6 +135,7 @@
 CpTelephonyPluginView::~CpTelephonyPluginView()
 {
     DPRINT << ": IN";
+    qDeleteAll(m_plugins);
     delete m_helper;
     DPRINT << ": OUT";
 }
@@ -152,6 +153,7 @@
     try {
         p = CpPluginLoader::loadCpPluginInterface(plugin);
         if (p && m_helper) {
+            m_plugins.append(p);
             items = p->createSettingFormItemData(*m_helper);
         }
     } catch(...) {
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.h	Thu Sep 02 20:26:16 2010 +0300
@@ -25,6 +25,7 @@
 
 class HbDataFormModelItem;
 class CpSettingFormItemData;
+class CpPluginInterface;
 
 // Class declaration 
 class CpTelephonyPluginView : public CpBaseSettingView
@@ -43,6 +44,7 @@
     
 private: // Data
     CpItemDataHelper *m_helper;
+    QList<CpPluginInterface*> m_plugins;
 };
 
 #endif /* CPTELEPHONYPLUGINVIEW_H_ */
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -45,5 +45,11 @@
 SOURCES += ../../src/cptelephonypluginview.cpp 
 
 # mocks needed for testing
+HEADERS += /epoc32/include/platform/mw/cpitemdatahelper.h
+HEADERS += /epoc32/include/platform/mw/cpsettingformitemdata.h
+HEADERS += cpbasesettingview.h
+
 SOURCES += ../../../tsrc/mocks/mock_cppluginloader.cpp
-
+SOURCES += ../../../tsrc/mocks/mock_cpbasesettingview.cpp
+SOURCES += ../../../tsrc/mocks/mock_cpitemdatahelper.cpp
+SOURCES += ../../../tsrc/mocks/mock_cpsettingformitemdata.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesettings/cpphonesettingsplugins/tsrc/common/qtestmains60.h	Thu Sep 02 20:26:16 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef QTESTMAINS60
+#define QTESTMAINS60
+
+#define QTEST_MAIN_S60(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+char *new_argv[3]; \
+QCoreApplication app(argc, argv); \
+\
+QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
+QByteArray   bytes  = str.toAscii(); \
+\
+char arg1[] = "-o"; \
+\
+new_argv[0] = argv[0]; \
+new_argv[1] = arg1; \
+new_argv[2] = bytes.data(); \
+\
+TestObject tc; \
+return QTest::qExec(&tc, 3, new_argv); \
+}
+
+#endif
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cmmanager.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cmmanager.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -429,7 +429,6 @@
 //
 HBufC * RCmManager::GetUncategorizedIconL( ) const
     {
-    //SMC_MOCK_METHOD0( CGulIcon * )
+    SMC_MOCK_METHOD0( HBufC * )
     }
 
-
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbasesettingview.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbasesettingview.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -16,7 +16,7 @@
 */
 #include <QDebug>
 #include <smcmockclassincludes.h>
-#include <cpbasesettingview.h>
+#include "cpbasesettingview.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -45,27 +45,6 @@
 
 
 // -----------------------------------------------------------------------------
-// CpBaseSettingView::returnValueDelivered
-// -----------------------------------------------------------------------------
-//
-void CpBaseSettingView::returnValueDelivered( 
-        const QVariant & returnValue )
-    {
-    //SMC_MOCK_METHOD1( void, const QVariant &, returnValue )
-    }
-
-
-// -----------------------------------------------------------------------------
-// CpBaseSettingView::aboutToClose
-// -----------------------------------------------------------------------------
-//
-void CpBaseSettingView::aboutToClose(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
 // CpBaseSettingView::close
 // -----------------------------------------------------------------------------
 //
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkpluginform.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkpluginform.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -192,3 +192,12 @@
     }
 
 
+// -----------------------------------------------------------------------------
+// CpNetworkPluginForm::chageVisbilityOfManualNetworkSelection
+// -----------------------------------------------------------------------------
+//
+void CpNetworkPluginForm::chageVisbilityOfManualNetworkSelection( 
+        bool visible )
+    {
+    SMC_MOCK_METHOD1( void, bool, visible )
+    }
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbicon.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbicon.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -355,7 +355,8 @@
 bool HbIcon::addBadge( 
         Qt::Alignment alignment,
         const HbIcon & badge,
-        int z )
+        int z,
+        Qt::AspectRatioMode aspectRatio)
     {
    /*
     SMC_MOCK_METHOD3( bool, Qt::Alignment, alignment, 
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -314,19 +314,6 @@
 // -----------------------------------------------------------------------------
 //
 void HbWidget::setBackgroundItem( 
-        HbStyle::Primitive ,
-        int  )
-    {
-  //  SMC_MOCK_METHOD2( void, HbStyle::Primitive, type, 
-    //    int, zValue )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbWidget::setBackgroundItem
-// -----------------------------------------------------------------------------
-//
-void HbWidget::setBackgroundItem( 
         QGraphicsItem * ,
         int  )
     {
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -18,6 +18,13 @@
 #include <smcmockclassincludes.h>
 #include "psetcalldivertingwrapper.h"
 
+class PSetCallDivertingWrapperPrivate {
+public:
+    PSetCallDivertingWrapperPrivate() {}
+    ~PSetCallDivertingWrapperPrivate() {}
+};
+
+
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper_p.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/* 
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include <mpsetdivertobs.h>
-#include <mphcltemergencycallobserver.h>
-#include <mmlist.h>
-#include <smcmockclassincludes.h>
-#include "psetcalldivertingwrapper_p.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::PSetCallDivertingWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetCallDivertingWrapperPrivate::PSetCallDivertingWrapperPrivate( 
-        PSetCallDivertingWrapper & owner )
-    : m_Owner(owner)
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::~PSetCallDivertingWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetCallDivertingWrapperPrivate::~PSetCallDivertingWrapperPrivate(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::HandleDivertingChangedL
-// -----------------------------------------------------------------------------
-//
-void PSetCallDivertingWrapperPrivate::HandleDivertingChangedL( 
-        const TCallDivertSetting & aSetting,
-        TBool aPlural )
-    {
-    SMC_MOCK_METHOD2( void, const TCallDivertSetting &, aSetting, 
-        TBool, aPlural )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::HandleDivertingStatusL
-// -----------------------------------------------------------------------------
-//
-void PSetCallDivertingWrapperPrivate::HandleDivertingStatusL( 
-        CMobilePhoneCFList & aSetting,
-        TBool aPlural )
-    {
-    SMC_MOCK_METHOD2( void, CMobilePhoneCFList &, aSetting, 
-        TBool, aPlural )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::HandleDivertingErrorL
-// -----------------------------------------------------------------------------
-//
-void PSetCallDivertingWrapperPrivate::HandleDivertingErrorL( 
-        TInt aReason )
-    {
-    SMC_MOCK_METHOD1( void, TInt, aReason )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::HandleCFRequestingL
-// -----------------------------------------------------------------------------
-//
-void PSetCallDivertingWrapperPrivate::HandleCFRequestingL( 
-        TBool aOngoing,
-        TBool aInterrupted )
-    {
-    SMC_MOCK_METHOD2( void, TBool, aOngoing, 
-        TBool, aInterrupted )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::SetEngineContact
-// -----------------------------------------------------------------------------
-//
-void PSetCallDivertingWrapperPrivate::SetEngineContact( 
-        MPsetCallDiverting * aDivertEngine )
-    {
-    SMC_MOCK_METHOD1( void, MPsetCallDiverting *, aDivertEngine )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::HandleEmergencyDialL
-// -----------------------------------------------------------------------------
-//
-void PSetCallDivertingWrapperPrivate::HandleEmergencyDialL( 
-        const TInt aStatus )
-    {
-    SMC_MOCK_METHOD1( void, const TInt, aStatus )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::convert
-// -----------------------------------------------------------------------------
-//
-TCallDivertingCondition PSetCallDivertingWrapperPrivate::convert( 
-        PsCallDivertingCondition type )
-    {
-    SMC_MOCK_METHOD1( TCallDivertingCondition, PsCallDivertingCondition, type )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::convert
-// -----------------------------------------------------------------------------
-//
-TDivertingStatus PSetCallDivertingWrapperPrivate::convert( 
-        PsCallDivertingStatus type )
-    {
-    SMC_MOCK_METHOD1( TDivertingStatus, PsCallDivertingStatus, type )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::convert
-// -----------------------------------------------------------------------------
-//
-TServiceGroup PSetCallDivertingWrapperPrivate::convert( 
-        PsServiceGroup type )
-    {
-    // TODO: QFlags does not compile with SymbianMock
-    // SMC_MOCK_METHOD1( TServiceGroup, PsServiceGroup, type )
-    Q_UNUSED(type)
-    SMC_MOCK_METHOD0( TServiceGroup )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallDivertingWrapperPrivate::convert
-// -----------------------------------------------------------------------------
-//
-TDivertingSetting PSetCallDivertingWrapperPrivate::convert( 
-        PsCallDivertingSetting type )
-    {
-    SMC_MOCK_METHOD1( TDivertingSetting, PsCallDivertingSetting, type )
-    }
-
-
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -17,7 +17,12 @@
 #include <QDebug>
 #include <smcmockclassincludes.h>
 #include "psetcallwaitingwrapper.h"
-#include "psetcallwaitingwrapper_p.h"
+
+class PSetCallWaitingWrapperPrivate {
+public:
+    PSetCallWaitingWrapperPrivate() {}
+    ~PSetCallWaitingWrapperPrivate() {}
+};
 
 // ============================ MEMBER FUNCTIONS ===============================
 
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper_p.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/* 
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include <QObject>
-#include <rsssettings.h>
-#include <psetcontainer.h>
-#include <psetcallwaiting.h>
-#include <smcmockclassincludes.h>
-#include "psetcallwaitingwrapper_p.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// PSetCallWaitingWrapperPrivate::PSetCallWaitingWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetCallWaitingWrapperPrivate::PSetCallWaitingWrapperPrivate( 
-        PSetCallWaitingWrapper & owner )
-    : m_Owner(owner)
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallWaitingWrapperPrivate::~PSetCallWaitingWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetCallWaitingWrapperPrivate::~PSetCallWaitingWrapperPrivate(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallWaitingWrapperPrivate::HandleCallWaitingGetStatusL
-// -----------------------------------------------------------------------------
-//
-void PSetCallWaitingWrapperPrivate::HandleCallWaitingGetStatusL( 
-        const MPsetCallWaiting::TGetCallWaitingStatus aStatus,
-        TUint8 aBsc[KPSetNumberOfBsc])
-    {
-    Q_UNUSED(aStatus)
-    Q_UNUSED(aBsc)
-    // TODO: make compile
-    //    SMC_MOCK_METHOD2( void, const MPsetCallWaiting::TGetCallWaitingStatus, aStatus, 
-    //        TUint8[KPSetNumberOfBsc], aBsc)
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallWaitingWrapperPrivate::HandleCallWaitingChangedL
-// -----------------------------------------------------------------------------
-//
-void PSetCallWaitingWrapperPrivate::HandleCallWaitingChangedL( 
-        const MPsetCallWaiting::TSetCallWaiting aSetting,
-        const TInt aResult )
-    {
-    SMC_MOCK_METHOD2( void, const MPsetCallWaiting::TSetCallWaiting, aSetting, 
-        const TInt, aResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallWaitingWrapperPrivate::HandleCWRequestingL
-// -----------------------------------------------------------------------------
-//
-void PSetCallWaitingWrapperPrivate::HandleCWRequestingL( 
-        TBool aOngoing,
-        TBool aInterrupted )
-    {
-    SMC_MOCK_METHOD2( void, TBool, aOngoing, 
-        TBool, aInterrupted )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallWaitingWrapperPrivate::HandleCWErrorL
-// -----------------------------------------------------------------------------
-//
-void PSetCallWaitingWrapperPrivate::HandleCWErrorL( 
-        TInt aReason )
-    {
-    SMC_MOCK_METHOD1( void, TInt, aReason )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCallWaitingWrapperPrivate::SetEngineContact
-// -----------------------------------------------------------------------------
-//
-void PSetCallWaitingWrapperPrivate::SetEngineContact( 
-        MPsetCallWaiting & aEngineContact )
-    {
-    SMC_MOCK_METHOD1( void, MPsetCallWaiting &, aEngineContact )
-    }
-
-
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -17,7 +17,12 @@
 #include <QDebug>
 #include <smcmockclassincludes.h>
 #include "psetcliwrapper.h"
-#include "psetcliwrapper_p.h"
+
+class PSetCliWrapperPrivate {
+public:
+    PSetCliWrapperPrivate() {}
+    ~PSetCliWrapperPrivate() {}
+};
 
 // ============================ MEMBER FUNCTIONS ===============================
 
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper_p.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/* 
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include <QObject>
-#include <rsssettings.h>
-#include <psetcontainer.h>
-#include <psetcli.h>
-#include <psuiconstants.h>
-#include <smcmockclassincludes.h>
-#include "psetcliwrapper_p.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::PSetCliWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetCliWrapperPrivate::PSetCliWrapperPrivate( 
-        PSetCliWrapper & owner )
-    : m_Owner(owner)
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::~PSetCliWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetCliWrapperPrivate::~PSetCliWrapperPrivate(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::SetEngineContact
-// -----------------------------------------------------------------------------
-//
-void PSetCliWrapperPrivate::SetEngineContact( 
-        MPsetCli * aEngine )
-    {
-    SMC_MOCK_METHOD1( void, MPsetCli *, aEngine )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::HandleCliRequestingL
-// -----------------------------------------------------------------------------
-//
-void PSetCliWrapperPrivate::HandleCliRequestingL( 
-        TBool aOngoing,
-        TBool aInterrupted )
-    {
-    SMC_MOCK_METHOD2( void, TBool, aOngoing, 
-        TBool, aInterrupted )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::CliInformationL
-// -----------------------------------------------------------------------------
-//
-void PSetCliWrapperPrivate::CliInformationL( 
-        TPsuiCli aType )
-    {
-    SMC_MOCK_METHOD1( void, TPsuiCli, aType )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::HandleCliStatusL
-// -----------------------------------------------------------------------------
-//
-void PSetCliWrapperPrivate::HandleCliStatusL( 
-        TUint8 aBsc[KPSetNumberOfBsc],
-        TPsuiCli aMode )
-    {
-    // TODO: make compile
-    Q_UNUSED(aBsc)
-    Q_UNUSED(aMode)
-    //SMC_MOCK_METHOD2( void, TUint8[KPSetNumberOfBsc], aBsc, TPsuiCli, aMode )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::HandleCnapStatusL
-// -----------------------------------------------------------------------------
-//
-void PSetCliWrapperPrivate::HandleCnapStatusL( 
-        TInt aStatus )
-    {
-    SMC_MOCK_METHOD1( void, TInt, aStatus )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetCliWrapperPrivate::HandleCliErrorL
-// -----------------------------------------------------------------------------
-//
-void PSetCliWrapperPrivate::HandleCliErrorL( 
-        TInt aError )
-    {
-    SMC_MOCK_METHOD1( void, TInt, aError )
-    }
-
-
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetnetworkwrapper_p.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-/* 
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include <rmmcustomapi.h>
-#include <PsetContainer.h>
-#include <PsetNetwork.h>
-#include <smcmockclassincludes.h>
-#include <psetcsp.h>
-#include "psetnetworkwrapper_p.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::PSetNetworkWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetNetworkWrapperPrivate::PSetNetworkWrapperPrivate( 
-        PSetNetworkWrapper & owner,
-        CPsetContainer & psetContainer )
-    : m_owner(owner)
-    {
-    Q_UNUSED(psetContainer)
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::~PSetNetworkWrapperPrivate
-// -----------------------------------------------------------------------------
-//
-PSetNetworkWrapperPrivate::~PSetNetworkWrapperPrivate(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::getAvailableNetworks
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::getAvailableNetworks(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::getNetworkSelectionMode
-// -----------------------------------------------------------------------------
-//
-PSetNetworkWrapper::ErrorCode PSetNetworkWrapperPrivate::getNetworkSelectionMode( 
-        PSetNetworkWrapper::NetworkSelectionMode & mode ) const
-    {
-    SMC_MOCK_METHOD1( PSetNetworkWrapper::ErrorCode, PSetNetworkWrapper::NetworkSelectionMode &, mode )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::selectNetwork
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::selectNetwork( 
-        const PSetNetworkWrapper::NetworkInfo & networkInfo )
-    {
-    SMC_MOCK_METHOD1( void, const PSetNetworkWrapper::NetworkInfo &, networkInfo )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::cancelRequest
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::cancelRequest(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::getNetworkAccessMode
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::getNetworkAccessMode(  ) const
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::setNetworkAccessMode
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::setNetworkAccessMode( 
-        PSetNetworkWrapper::NetworkAccessMode mode )
-    {
-    SMC_MOCK_METHOD1( void, PSetNetworkWrapper::NetworkAccessMode, mode )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleNetworkInfoReceivedL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleNetworkInfoReceivedL( 
-        const CNetworkInfoArray * aInfoArray,
-        const TInt aResult )
-    {
-    SMC_MOCK_METHOD2( void, const CNetworkInfoArray *, aInfoArray, 
-        const TInt, aResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleCurrentNetworkInfoL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleCurrentNetworkInfoL( 
-        const MPsetNetworkSelect::TCurrentNetworkInfo & aCurrentInfo,
-        const TInt aResult )
-    {
-    SMC_MOCK_METHOD2( void, const MPsetNetworkSelect::TCurrentNetworkInfo &, aCurrentInfo, 
-        const TInt, aResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleNetworkChangedL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleNetworkChangedL( 
-        const MPsetNetworkSelect::TNetworkInfo & aCurrentInfo,
-        const MPsetNetworkSelect::TCurrentNetworkStatus aStatus,
-        const TInt aResult )
-    {
-    SMC_MOCK_METHOD3( void, const MPsetNetworkSelect::TNetworkInfo &, aCurrentInfo, 
-        const MPsetNetworkSelect::TCurrentNetworkStatus, aStatus, 
-        const TInt, aResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleNetworkChangedL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleNetworkChangedL( 
-        const MPsetNetworkSelect::TNetworkInfo & aCurrentInfo,
-        const RMobilePhone::TMobilePhoneRegistrationStatus & aStatus,
-        const TInt aResult )
-    {
-    SMC_MOCK_METHOD3( void, const MPsetNetworkSelect::TNetworkInfo &, aCurrentInfo, 
-        const RMobilePhone::TMobilePhoneRegistrationStatus &, aStatus, 
-        const TInt, aResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleSearchingNetworksL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleSearchingNetworksL( 
-        MPsetNetworkInfoObserver::TServiceRequest aRequest )
-    {
-    SMC_MOCK_METHOD1( void, MPsetNetworkInfoObserver::TServiceRequest, aRequest )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleRequestingSelectedNetworkL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleRequestingSelectedNetworkL( 
-        TBool aOngoing )
-    {
-    SMC_MOCK_METHOD1( void, TBool, aOngoing )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleCallActivatedL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleCallActivatedL(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleNetworkErrorL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleNetworkErrorL( 
-        const MPsetNetworkInfoObserver::TServiceRequest aRequest,
-        const TInt aError )
-    {
-    SMC_MOCK_METHOD2( void, const MPsetNetworkInfoObserver::TServiceRequest, aRequest, 
-        const TInt, aError )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleNetworkSystemModeEventsL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleNetworkSystemModeEventsL( 
-        const MPsetNetworkModeObserver::TServiceRequest aRequest,
-        const TUint32 aNetworkModeCaps )
-    {
-    SMC_MOCK_METHOD2( void, const MPsetNetworkModeObserver::TServiceRequest, aRequest, 
-        const TUint32, aNetworkModeCaps )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PSetNetworkWrapperPrivate::HandleNetworkErrorL
-// -----------------------------------------------------------------------------
-//
-void PSetNetworkWrapperPrivate::HandleNetworkErrorL( 
-        const MPsetNetworkModeObserver::TServiceRequest aRequest,
-        const TInt aError )
-    {
-    SMC_MOCK_METHOD2( void, const MPsetNetworkModeObserver::TServiceRequest, aRequest, 
-        const TInt, aError )
-    }
-
-
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_qsysteminfo.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_qsysteminfo.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -240,6 +240,26 @@
 
 
 // -----------------------------------------------------------------------------
+// QSystemDeviceInfo::connectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemDeviceInfo::connectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::disconnectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemDeviceInfo::disconnectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
 // QSystemInfo::QSystemInfo
 // -----------------------------------------------------------------------------
 //
@@ -315,6 +335,26 @@
 
 
 // -----------------------------------------------------------------------------
+// QSystemInfo::connectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemInfo::connectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::disconnectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemInfo::disconnectNotify(const char *signal)
+{
+    SMC_MOCK_METHOD1( void, const char *, signal )
+}
+
+
+// -----------------------------------------------------------------------------
 // QSystemNetworkInfo::QSystemNetworkInfo
 // -----------------------------------------------------------------------------
 //
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_xqsettingsmanager.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_xqsettingsmanager.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -49,7 +49,7 @@
         const XQSettingsKey & key,
         XQSettingsManager::Type type )
     {
-    SMC_MOCK_METHOD2( QVariant, XQSettingsKey &, key, XQSettingsManager::Type, type )
+    SMC_MOCK_METHOD2( QVariant, const XQSettingsKey &, key, XQSettingsManager::Type, type )
     }
 
 
@@ -61,7 +61,7 @@
         const XQSettingsKey & key,
         const QVariant & value )
     {
-    SMC_MOCK_METHOD2( bool, XQSettingsKey &, key, QVariant &, value )
+    SMC_MOCK_METHOD2( bool, const XQSettingsKey &, key, const QVariant &, value )
     }
 
 
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -45,9 +45,12 @@
 
 HEADERS += ut_mockintegrity.h
 
-HEADERS += ../../callsplugin/src/cpcallsplugin.h                \
+HEADERS += ../../callsplugin/src/*.h                            \
+           ../../barringplugin/inc/*.h                          \
+           ../../cpnetworkplugin/src/*.h                        \
            ../../cptelephonyutils/inc/cpplugincommon.h          \
            ../../cptelephonyutils/inc/cpphonelocalisation.h     \
+           ../../telephonyplugin/src/cptelephonypluginview.h    \
            /epoc32/include/platform/mw/psetwrapper.h            \
            /epoc32/include/platform/mw/psuinotes.h              \
            /epoc32/include/platform/mw/psetcliwrapper.h         \
@@ -62,5 +65,3 @@
            /epoc32/include/mw/qsysteminfo.h
 
 SOURCES += *.cpp
-
-  
\ No newline at end of file
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMGripHandler.h	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneuis/TelephonyDeviceMode/inc/CTelDMGripHandler.h	Thu Sep 02 20:26:16 2010 +0300
@@ -111,7 +111,7 @@
         * @param aValue the value associated with the central repository ID
         * @return
         */
-        TInt CTelDMGripHandler::GetInt( 
+        TInt GetInt( 
             const TUid& aUid, 
             const TUint aId,
             TInt& aValue ) const;
--- a/phoneuis/bubblemanager2/bubblecore/bubblecore.pro	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/bubblecore.pro	Thu Sep 02 20:26:16 2010 +0300
@@ -48,4 +48,5 @@
 
 # Input
 include(src/bubblecore.pri)
+include(xml/bubbledocml.pri)
 RESOURCES += bubblecore.qrc
--- a/phoneuis/bubblemanager2/bubblecore/bubblecore.qrc	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/bubblecore.qrc	Thu Sep 02 20:26:16 2010 +0300
@@ -1,10 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>xml/bubble_layout_1.docml</file>
-        <file>xml/bubble_layout_2.docml</file>
-        <file>xml/bubble_layout_3.docml</file>
-        <file>xml/bubble_layout_4.docml</file>
-        <file>xml/bubble_layout_5.docml</file>
         <file alias="bubble_muted_disappear.fxml">effects/bubble_muted_disappear.fxml</file>
         <file alias="bubble_muted_appear.fxml">effects/bubble_muted_appear.fxml</file>
         <file alias="bubbleheadingwidget.widgetml">xml/bubbleheadingwidget.widgetml</file>
@@ -16,5 +11,10 @@
         <file alias="bubble_icon_anim.axml">resources/bubble_icon_anim.axml</file>
         <file alias="bubbleparticipantlistbuttons.widgetml">xml/bubbleparticipantlistbuttons.widgetml</file>
         <file alias="bubbleparticipantlistbuttons.css">xml/bubbleparticipantlistbuttons.css</file>
+        <file alias="bubble_layout_5.docml">xml/bubble_layout_5.docml.bin</file>
+        <file alias="bubble_layout_1.docml">xml/bubble_layout_1.docml.bin</file>
+        <file alias="bubble_layout_2.docml">xml/bubble_layout_2.docml.bin</file>
+        <file alias="bubble_layout_3.docml">xml/bubble_layout_3.docml.bin</file>
+        <file alias="bubble_layout_4.docml">xml/bubble_layout_4.docml.bin</file>
     </qresource>
 </RCC>
--- a/phoneuis/bubblemanager2/bubblecore/src/bubblewidgetmanager.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubblewidgetmanager.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -51,15 +51,15 @@
 {
     // .docml mappings
     mFileNames.insert(SingleCallView,
-                      QLatin1String(":/xml/bubble_layout_1.docml"));
+                      QLatin1String(":/bubble_layout_1.docml"));
     mFileNames.insert(TwoCallsView,
-                      QLatin1String(":/xml/bubble_layout_2.docml"));
+                      QLatin1String(":/bubble_layout_2.docml"));
     mFileNames.insert(ThreeCallsView,
-                      QLatin1String(":/xml/bubble_layout_3.docml"));
+                      QLatin1String(":/bubble_layout_3.docml"));
     mFileNames.insert(ConferenceView,
-                      QLatin1String(":/xml/bubble_layout_4.docml"));
+                      QLatin1String(":/bubble_layout_4.docml"));
     mFileNames.insert(MutedOverlay,
-                      QLatin1String(":/xml/bubble_layout_5.docml"));
+                      QLatin1String(":/bubble_layout_5.docml"));
 
     mOrientationName.insert(Qt::Vertical, QLatin1String("portrait"));
     mOrientationName.insert(Qt::Horizontal, QLatin1String("landscape"));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/xml/bubbledocml.pri	Thu Sep 02 20:26:16 2010 +0300
@@ -0,0 +1,22 @@
+#
+# 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:
+#
+#
+
+DOCML += xml/bubble_layout_1.docml \
+         xml/bubble_layout_2.docml \
+         xml/bubble_layout_3.docml \
+         xml/bubble_layout_4.docml \
+         xml/bubble_layout_5.docml
--- a/phoneuis/bubblemanager2/tsrc/unit/loctest/loctest.cpp	Wed Aug 18 09:48:26 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/loctest/loctest.cpp	Thu Sep 02 20:26:16 2010 +0300
@@ -23,7 +23,8 @@
 #include <hbaction.h>
 #include <hbtoolbar.h>
 #include <hbview.h>
-#include <private/hbtextmeasurementutility_p.h> // hb "configure --developer" required
+#include <restricted/hbtextmeasurementutility_r.h> // hb "configure --developer" required
+#include <restricted/hbfeaturemanager_r.h>
 #include <hbdeviceprofile.h>
 
 #include "bubbletest.h"
@@ -40,9 +41,7 @@
     void cleanupTestCase();
 
     void testPortraitStrings();
-
     void changeOrientation();
-
     void testLandscapeStrings();
 
 private:
@@ -73,6 +72,10 @@
     mainWindow->currentView()->setToolBar(toolBar);
 
     mainWindow->show();
+
+    HbFeatureManager::instance()->setFeatureStatus(
+        HbFeatureManager::TextMeasurement, true);
+
     QTest::qWait( 3000 );
 }
 
@@ -86,8 +89,7 @@
 {
     view->setTitle( "Measuring portrait" );
 
-    // In portrait all text fields have same width, only font
-    // is different between label and cli field.
+    // texts fields are measured according to most narrow situation
 
     // create test bubble
     bubbleManager->startChanges();
@@ -100,13 +102,27 @@
     action2.setSoftKeyRole(QAction::NegativeSoftKey);
     bubbleManager->addAction( bubbleId, &action2 );
     bubbleManager->setCallObjectFromTheme(bubbleId);
+    bubbleManager->setCallFlag(bubbleId,BubbleManagerIF::NoCiphering,true);
     bubbleManager->endChanges();
 
     QTest::qWait( WAIT_TIME );
 
     // measure label texts
+
+    // First line texts with ciphering indicator
+    bubbleManager->startChanges();
+    bubbleManager->setState( bubbleId, BubbleManager::Outgoing );
+    bubbleManager->endChanges();
+
     testLabel(bubbleId,"txt_phone_other_calling");
 
+    testLabel(bubbleId,"txt_phone_other_attempting");
+
+    // Second line texts, no indicators -> full width
+    bubbleManager->startChanges();
+    bubbleManager->setState( bubbleId, BubbleManager::Incoming );
+    bubbleManager->endChanges();
+
     testLabel(bubbleId,"txt_phone_other_incoming_call");
 
     testLabel(bubbleId,"txt_phone_other_waiting");
@@ -115,18 +131,31 @@
 
     testLabel(bubbleId,"txt_phone_other_disconnected");
 
-    testLabel(bubbleId,"txt_phone_other_attempting");
+    testLabel(bubbleId,"txt_phone_other_incoming_video_call");
+
+    testLabel(bubbleId,"txt_phone_other_incoming_l1_call");
+
+    // First line CLI texts with ciphering indicator
+    testCli(bubbleId,"txt_phone_other_conference_call");
 
-    // measure cli texts
-    testCli(bubbleId,"txt_phone_other_conference_call");
+    testCli(bubbleId,"txt_phone_other_remote_sim");
+
+    testCli(bubbleId,"txt_phone_other_emergency_call");
+
+    // First line CLI texts with ciphering and divert indicators
+    bubbleManager->startChanges();
+    bubbleManager->setCallFlag( bubbleId, BubbleManager::Diverted, true );
+    bubbleManager->endChanges();
 
     testCli(bubbleId,"txt_phone_other_unknown_number");
 
-    testCli(bubbleId,"txt_phone_other_remote_sim");
-
     testCli(bubbleId,"txt_phone_other_private_number");
 
-    testCli(bubbleId,"txt_phone_other_emergency_call");
+    testCli(bubbleId,"txt_phone_other_payphone");
+
+    bubbleManager->startChanges();
+    bubbleManager->setCallFlag( bubbleId, BubbleManager::Diverted, false );
+    bubbleManager->endChanges();
 
     // write results
     QTest::qWait( WAIT_TIME );
@@ -146,8 +175,8 @@
 void LocTest::changeOrientation()
 {
     view->setTitle( "Changing orientation" );
+    mainWindow->resize(640,360);
     mainWindow->setOrientation(Qt::Horizontal);
-    mainWindow->resize(640,360);
     QTest::qWait(3000);
 }
 
@@ -155,56 +184,72 @@
 {
     view->setTitle( "Measuring landscape" );
 
-    // In landscape text field width depends on call situation,
-    // measure according to most narrow case.
+    // texts fields are measured according to most narrow situation
 
     // create test bubble
     bubbleManager->startChanges();
     int bubbleId = bubbleManager->createCallHeader();
-    bubbleManager->setState( bubbleId, BubbleManager::OnHold );
+    bubbleManager->setState( bubbleId, BubbleManager::Incoming );
     HbAction action1("End call", this);
     action1.setSoftKeyRole(QAction::PositiveSoftKey);
     bubbleManager->addAction( bubbleId, &action1 );
     bubbleManager->setCallObjectFromTheme(bubbleId);
+    bubbleManager->setCallFlag( bubbleId, BubbleManager::NoCiphering, true );
     bubbleManager->endChanges();
 
+    // Single call "only" texts
 
-    // only in single call texts
+    // Second line texts, no indicators -> full width
     testLabel(bubbleId,"txt_phone_other_incoming_call");
 
+    testLabel(bubbleId,"txt_phone_other_incoming_video_call");
+
+    testLabel(bubbleId,"txt_phone_other_incoming_l1_call");
+
+    bubbleManager->startChanges();
+    bubbleManager->setState( bubbleId, BubbleManager::Outgoing );
+    bubbleManager->endChanges();
+
+    // First line texts, with ciphering indicator
     testLabel(bubbleId,"txt_phone_other_attempting");
 
+    testLabel(bubbleId,"txt_phone_other_calling");
+
+    bubbleManager->startChanges();
+    bubbleManager->setState( bubbleId, BubbleManager::Active );
+    bubbleManager->endChanges();
+
     testCli(bubbleId,"txt_phone_other_emergency_call");
 
-    // multicall
+    // Add another call
     bubbleManager->startChanges();
     int bubbleId2 = bubbleManager->createCallHeader();
-    bubbleManager->setState( bubbleId2, BubbleManager::OnHold );
-    int bubbleId3 = bubbleManager->createCallHeader();
-    bubbleManager->setState( bubbleId3, BubbleManager::Waiting );
-    HbAction action2("Replace", this);
-    action2.setSoftKeyRole(QAction::PositiveSoftKey);
-    bubbleManager->addAction( bubbleId3, &action1 );
-    bubbleManager->setCallObjectFromTheme(bubbleId3);
+    bubbleManager->setState( bubbleId, BubbleManager::OnHold );
+    bubbleManager->setState( bubbleId2, BubbleManager::Active );
+    bubbleManager->setCallObjectFromTheme(bubbleId2);
     bubbleManager->endChanges();
 
-    // measure label texts
-    testLabel(bubbleId2,"txt_phone_other_calling");
+    testLabel(bubbleId,"txt_phone_other_on_hold");
+
+    testLabel(bubbleId,"txt_phone_other_disconnected");
 
-    testLabel(bubbleId2,"txt_phone_other_waiting");
+    testCli(bubbleId,"txt_phone_other_conference_call");
 
-    testLabel(bubbleId2,"txt_phone_other_on_hold");
-
-    testLabel(bubbleId2,"txt_phone_other_disconnected");
+    testCli(bubbleId,"txt_phone_other_remote_sim");
 
-    // measure cli texts
-    testCli(bubbleId2,"txt_phone_other_conference_call");
+    // Add ciphering indicator
+    bubbleManager->startChanges();
+    bubbleManager->setState( bubbleId, BubbleManager::Waiting );
+    bubbleManager->setCallFlag( bubbleId, BubbleManager::Diverted, true );
+    bubbleManager->endChanges();
 
-    testCli(bubbleId3,"txt_phone_other_unknown_number");
+    testCli(bubbleId,"txt_phone_other_unknown_number");
+
+    testCli(bubbleId,"txt_phone_other_private_number");
 
-    testCli(bubbleId3,"txt_phone_other_remote_sim");
+    testCli(bubbleId,"txt_phone_other_payphone");
 
-    testCli(bubbleId3,"txt_phone_other_private_number");
+    testLabel(bubbleId,"txt_phone_other_waiting");
 
     // write results
     QTest::qWait( WAIT_TIME );
@@ -218,7 +263,6 @@
     bubbleManager->startChanges();
     bubbleManager->removeCallHeader( bubbleId );
     bubbleManager->removeCallHeader( bubbleId2 );
-    bubbleManager->removeCallHeader( bubbleId3 );
     bubbleManager->endChanges();
     QTest::qWait( WAIT_TIME );
 }