--- a/vmbx/vmbxcpplugin/inc/vmbxcpgroup.h	Thu May 27 13:23:05 2010 +0300
+++ b/vmbx/vmbxcpplugin/inc/vmbxcpgroup.h	Fri Jun 11 14:07:16 2010 +0300
@@ -21,6 +21,7 @@
 // System includes
 #include <cpsettingformitemdata.h>
 #include <voicemailboxdefs.h>
+#include <QModelIndex>
 
 
 // Forward declarations
@@ -28,6 +29,7 @@
 class CpItemDataHelper;
 class HbDataFormModelItem;
 
+
 // Class declaration
 class VmbxCpGroup : public CpSettingFormItemData
 {
@@ -49,17 +51,6 @@
 private slots:
 
     /*!
-        Notification slot for engine signal about 
-        Voice Mailbox entries' changes
-    */
-    void voiceMailboxEngineEntriesUpdated();
-
-    /*!
-        Save default Mailbox
-    */
-    void saveDefaultMailbox(int aIndex);
-
-    /*!
         Query cs voice number when user click line edit
     */
     void queryCsVoiceNumber();
@@ -72,34 +63,30 @@
     /*!
         Update number when vmbx number changed by OTA,OMA etc.
     */
-    void vmbxNumberChanged(const TVmbxType vmbxType);
+    void updateVmbxNumber(const TVmbxType vmbxType);
 
+    /*!
+         Slot which handles item updating when it is needed.
+     */
+    void itemShown(const QModelIndex &item);    
+    
 private:
     
     /*!
         Preparation before loading
     */
-    void loadingPreparation(CpItemDataHelper &itemDataHelper);    
+    void loadingPreparation();    
     
     /*!
-        Update default mailbox
-    */
-    void updateDefaultMailboxToUi();
-
+         Create the data form item by type
+     */
+    HbDataFormModelItem* createDataFormModelItem(const TVmbxType vmbxType);
+        
     /*!
-       Update Cs voice primary 
-    */
-    void updateCsVoice1ToUi();
+      Update the vmbx number to the UI
+     */
+    void UpdateWidgetContent(const QModelIndex &item, const QString &string);
 
-    /*!
-       update Cs video primary
-    */
-    void updateCsVideo1ToUi();
-    
-    /*!
-        Update all mailboxes
-    */
-    void updateAllMailboxesToUi();
 
 private:
     
@@ -114,6 +101,15 @@
 
     // Not own.
     HbDataFormModelItem *mCsVideo1Editor;
+    
+    // Index
+    QModelIndex mCsVoice1Index;
+
+    // Index
+    QModelIndex mCsVideo1Index;
+    
+    // Not own
+    CpItemDataHelper &mItemHelper;
 };
 
 #endif // VMBXCPGROUP_H