--- a/vmbx/vmbxcpplugin/inc/vmbxcpgroup.h	Mon May 03 13:01:45 2010 +0300
+++ b/vmbx/vmbxcpplugin/inc/vmbxcpgroup.h	Fri May 14 16:24:46 2010 +0300
@@ -14,40 +14,34 @@
  * Description:  
  *
  */
+
 #ifndef VMBXCPGROUP_H
 #define VMBXCPGROUP_H
 
 // System includes
 #include <cpsettingformitemdata.h>
+#include <voicemailboxdefs.h>
+
 
 // Forward declarations
 class VmbxUiEngine;
 class CpItemDataHelper;
+class HbDataFormModelItem;
 
 // Class declaration
 class VmbxCpGroup : public CpSettingFormItemData
 {
     Q_OBJECT
+
 public:
     
     /*!
         Constructor
     */
     VmbxCpGroup( 
-        HbDataFormModelItem::DataItemType type,
-        const QString &label,
-        const QString &configFile,
-        const HbDataFormModelItem *parent,
         CpItemDataHelper &itemDataHelper);
 
     /*!
-        Constructor
-    */
-     explicit VmbxCpGroup(
-        const QString &configFile = QString(),
-        const HbDataFormModelItem *parent = 0);
-
-    /*!
         Destructor
     */
     ~VmbxCpGroup();
@@ -60,51 +54,52 @@
     */
     void voiceMailboxEngineEntriesUpdated();
 
+    /*!
+        Save default Mailbox
+    */
+    void saveDefaultMailbox(int aIndex);
+
+    /*!
+        Query cs voice number when user click line edit
+    */
+    void queryCsVoiceNumber();
+
+    /*!
+        Query cs video number when user click line edit
+    */
+    void queryCsVideoNumber();
+
+    /*!
+        Update number when vmbx number changed by OTA,OMA etc.
+    */
+    void vmbxNumberChanged(const TVmbxType vmbxType);
+
 private:
+    
+    /*!
+        Preparation before loading
+    */
+    void loadingPreparation(CpItemDataHelper &itemDataHelper);    
+    
+    /*!
+        Update default mailbox
+    */
+    void updateDefaultMailboxToUi();
 
     /*!
        Update Cs voice primary 
     */
-    void updateCsVoicePrimaryToUi();
-
-    /*!
-        Update Cs voice Als
-    */
-    void updateCsVoiceAlsToUi();
+    void updateCsVoice1ToUi();
 
     /*!
        update Cs video primary
     */
-    void updateCsVideoPrimaryToUi();
-    
-    /*! 
-       NOTICE: IT IS POSSIBLE THAT PS SERVICES WILL NOT BE DISPLAYED 
-       BY VMBX CONTROL PANEL WHEN WE GET THE NEW UI CONCEPT!!!!!! 
-       In that case this is not needed
-    */
-
-    /*!
-       update Ps services
-    */
-    void updatePsServicesToUi();
-
-    /*!
-        Update default mailbox
-    */
-    void updateDefaultMailboxToUi();
+    void updateCsVideo1ToUi();
     
     /*!
         Update all mailboxes
     */
     void updateAllMailboxesToUi();
-    
-private:
-
-    /*!
-        Preparation before loading
-    */
-    void loadingPreparation(CpItemDataHelper &itemDataHelper);
-
 
 private:
     
@@ -112,16 +107,13 @@
     VmbxUiEngine *mUiEngine;
 
     // Not own.
-    CpSettingFormItemData *mEditorCsVoice1;
-    
+    CpSettingFormItemData *mDefaultMailboxEditor;    
+
     // Not own.
-    CpSettingFormItemData *mEditorCsVoice2;
-    
+    HbDataFormModelItem *mCsVoice1Editor;
+
     // Not own.
-    CpSettingFormItemData *mEditorCsVideo1;
-
-    // Contained pointers not own.
-    QList<CpSettingFormItemData *> mPsServiceEditors;
+    HbDataFormModelItem *mCsVideo1Editor;
 };
 
 #endif // VMBXCPGROUP_H