--- a/phoneengine/phonemodel/inc/cpeparsersshandler.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneengine/phonemodel/inc/cpeparsersshandler.h	Tue Aug 31 15:14:29 2010 +0300
@@ -22,10 +22,10 @@
 #define CPEPARSERSSHANDLER_H
 
 //  INCLUDES
-#include <CPhoneGsmSsHandler.h>
+#include <cphonegsmsshandler.h>
 #include <pevirtualengine.h>
 #include <nwdefs.h>
-#include <MPsetRequestObs.h>
+#include <mpsetrequestobs.h>
 
 // FORWARD DECLARATIONS
 class CPEMessageHandler;
@@ -40,6 +40,12 @@
 class CPsuiDivertObs;
 class CPsuiCliObserver;
 
+class PSetCallDivertingWrapper;
+class PSetCallWaitingWrapper;
+class PSetWrapper;
+class PsUiDivertNoteHandler;
+class PsUiWaitingNoteHandler;
+
 // CLASS DECLARATION
 
 /**
@@ -233,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
@@ -277,23 +283,34 @@
         CPsetContainer* iSettings;
         // Owned phone settings ui container.
         CPsuiContainer* iObsContainer;
-        // Owned call waiting.
-        CPsetCallWaiting* iWaiting;
-        // Owned waiting observer.
-        CPsuiWaitingObs* iCwObserver;
+       
         // Owned call barring.
         CPsetCallBarring* iBarring;
         // Owned call barring observer.
-        CPsuiBarringObs* iCbObserver;
-        // Owned call diverting.
-        CPsetCallDiverting* iDivert;
-        // Owned call diverting observer.
-        CPsuiDivertObs* iCfObserver;
+        CPsuiBarringObs* iCbObserver;    
+    
         // Owned calling line identity.
         CPsetCli* iCli;
         // Owned calling line identity observer.
         CPsuiCliObserver* iCliObserver;
+        
+        
+        // Call diverting. Not own.
+        CPsetCallDiverting* iDivert;  
+        // Call divert wrapper. Not own
+        PSetCallDivertingWrapper* iCallDivertingWrapper;
+        // Call diverting note handler, Own
+        PsUiDivertNoteHandler* iCallDivertingHandler;
+      
+        // Owned call waiting. Now Own
+        CPsetCallWaiting* iWaiting;
+        // Call divert wrapper. Not own
+        PSetCallWaitingWrapper* iCallWaitingWrapper;
+        // Call diverting note handler, Own
+        PsUiWaitingNoteHandler* iCallWaitingHandler;
 
+        // Setting wrappers. Own. 
+        PSetWrapper *iPsetWrapper;  
     };
 
 #endif      // CPEPARSERSSHANDLER_H