diff -r ae8abd0db65c -r e32024264ebb vmbx/vmbxcpplugin/inc/vmbxuiengine.h
--- a/vmbx/vmbxcpplugin/inc/vmbxuiengine.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/vmbx/vmbxcpplugin/inc/vmbxuiengine.h	Fri Apr 16 15:31:58 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -17,125 +17,102 @@
 #ifndef VMBXUIENGINE_H
 #define VMBXUIENGINE_H
 
-#include <qobject.h>
+// System includes
+#include <QObject>
 #include <mvoicemailboxobserver.h>
 
+// Forward declarations
 class CVoiceMailbox;
-/*!
- *  VmbxUiEngine
+class TVoiceMailboxParams;
 
- *  @lib vmbxcpplugin.lib
- *  @since S60 v5.2
- */
+// Class declaration
 class VmbxUiEngine : public QObject, public MVoiceMailboxObserver
 {
     Q_OBJECT
-    
-public:
-    /*! Default Voice Mailbox setting values.*/
-    enum TUiDefaultVoiceMailboxType
-        {
-        /*!
-         *  None vmbx type.
-         */
-        EUiDefaultVmbxNone = 0,
-        /*!
-         *  Voice type.
-         */
-        EUiDefaultVmbxVoice,
-        /*!
-         *  Video type.
-         */
-        EUiDefaultVmbxVideo,
-        /*!
-         *  Voip type.
-         */
-        EUiDefaultVmbxPsService
-        };
             
 public:
     /*!
-     *  Constructor.
-     */
+        Constructor.
+    */
     VmbxUiEngine();
 
     /*!
-     *  Destructor
-     */
+        Destructor
+    */
     ~VmbxUiEngine();
 
 public:
 
     /*!
-     * Getter method for Voice number of Voice Mailbox.
-     *
-     * @since S60 v5.2
-     * @param aValue Retrieved number.
-     */
-    void GetCsVoice1Number( QString& aValue );
+        Getter method for primary voice number of Voice Mailbox.
+        @param aValue Retrieved number.
+    */
+    void getCsVoice1Number(QString &aValue);
     /*!
-     * Getter method for Voice ALS number of Voice Mailbox.
-     *
-     * @since S60 v5.2
-     * @param aValue Retrieved number.
-     */
-    void GetCsVoice2Number( QString& aValue );
+        Getter method for voice ALS number of Voice Mailbox.
+        @param aValue Retrieved number.
+    */
+    void getCsVoice2Number(QString &aValue);
     
     /*!
-     * Getter method for Video number of Voice Mailbox.
-     *
-     * @since S60 v5.2
-     * @param aValue Retrieved number.
-     */
-    void GetCsVideo1Number( QString& aValue );  
+        Getter method for primary video number of Voice Mailbox.
+        @param aValue Retrieved number.
+    */
+    void getCsVideo1Number(QString &aValue);
       
+    // Add new Getter methods for other voice mailbox types
+    
+    // From MVoiceMailboxObserver
     /*!
-     * Getter method for default mailbox setting of Voice Mailbox.
-     *
-     * @since S60 v5.2
-     */
-    VmbxUiEngine::TUiDefaultVoiceMailboxType DefaultMailboxType();
-      
+        From MVoiceMailboxObserver
+        Observer callback for number/address change notification
+        from voice mailbox engine.
+        The UI should be notified to update the number.
+        @param aVmbxEntry New voicemailbox entry.
+    */
+    void HandleNotifyL(const CVoiceMailboxEntry &aVmbxEntry);
+
 signals:
 
     /*!
-     * Signal emitted when voice mailbox data has been updated.
-     *
-     * @since S60 v5.2
-     */
+        Signal emitted when voice mailbox data has been updated.
+    */
     void voiceMailboxEngineEntriesUpdated(); 
 
 public slots:
 
     /*!
-     * Slot for signal when number has been edited on UI.
-     *
-     * @since S60 v5.2
-     * @param aValue New value.
-     */
-     void uiCsVoice1Changed( const QString& aValue );
+        Slot for signal when number has been edited on UI.
+        @param aValue New value.
+    */
+    void uiCsVoice1Changed( const QString &aValue );
      
-private:
-// from MVoiceMailboxObserver
+private: // New Method    
+    
     /*!
-     * From MVoiceMailboxObserver 
-     * Observer callback for number/address change notification 
-     * from voice mailbox engine.
-     * The UI should be notified to update the number.
-     *
-     * @since S60 v5.2
-     * @param aVmbxEntry New voicemailbox entry.
-     */
-    void HandleNotifyL( const CVoiceMailboxEntry& aVmbxEntry );
+        Getter method for voice mailbox number.
+        @param aParam Identify voice mailbox type
+        @param aValue Retrieved number.
+    */    
+    void getNumber(const TVoiceMailboxParams &aParam, 
+                   QString &aValue);
+    
+    /*!
+        Setter method for voice mailbox number.
+        @param aParam Identify voice mailbox type
+        @param aValue Retrieved number.
+    */
+    void setNumber(const TVoiceMailboxParams &aParam, 
+                   const QString &aValue);
 
 private:
 
     /*!
-     * Symbian voice mailbox engine which offers basic entry retrieval,
-     * saving, querying etc. services.     
-     * Own.     
-     */
-    CVoiceMailbox* mVmbxEngine;
+        Symbian voice mailbox engine which offers basic entry retrieval,
+        saving, querying etc. services.
+        Own.
+    */
+    CVoiceMailbox *mVmbxEngine;
 };
 
 #endif // VMBXUIENGINE_H