--- a/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h	Thu Jan 07 12:45:29 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h	Tue Feb 02 00:09:07 2010 +0200
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  MUSSettingsPlugin model class.
-*  Version     : %version: 8.1.2.1.3 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: 10 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -21,20 +21,17 @@
 #ifndef  C_MUSSETTINGSMODEL_H
 #define  C_MUSSETTINGSMODEL_H
 
-#include 	"mussettings.h"
-
+#include <e32base.h>
+#include <badesca.h>
+//class CDesCArray;
 class MMusSIPProfileHandler;
 class CMusSIPProfileModel;
-class MultimediaSharingSettings;
-
 class CAknMemorySelectionDialogMultiDrive;
 
 
 /**
  *  CMusSettingsModel is the model class of GS application.
  *  It provides functions to get and set setting values.
- *
- *  @since S60 v3.2
  */
 class CMusSettingsModel : public CBase
     {
@@ -53,84 +50,11 @@
     ~CMusSettingsModel();
 
     /**
-     * Returns operator variant mode.
-     * @return 0: Standard (MusSettingsKeys::EStandard)
-     *         1: Operator Specific (MusSettingsKeys::EOperatorSpecific)
-     */
-    MusSettingsKeys::TOperatorVariant VSSettingsOperatorVariantL();
-
-    /**
-     * Returns VS activation mode.
-     * @return 0: Always (MusSettingsKeys::EAlwaysActive)
-     *         1: Automatic (MusSettingsKeys::EActiveInHomeNetworks)
-     *         2: Off (MusSettingsKeys::ENever)
-     */
-    MusSettingsKeys::TActivation VSSettingsActivationL();
-
-    /**
-     * Returns SIP profile mode.
-     * @return 0: Use default SIP profile.
-     *         1: Use user selected SIP profile.
-     */
-    TInt VSSettingsProfileL();
-
-    /**
-     * Returns video autorecord mode.
-     * @return 0: on  (MusSettingsKeys::EAutoRecordOn)
-     *		   1: off (MusSettingsKeys::EAutoRecordOff)
-     */
-    MusSettingsKeys::TAutoRecord VSSettingsAutoRecordL();
-
-    /**
      * Returns recorded video saving mode.
      * @return 2: phone memory 
      *         4: memory card 
      */
     TInt VSSettingsRecordedVideoSavingL();
-
-    /**
-     * Returns state of note (on/off). This setting is called "Capability
-     * auditory note" in standard variant and "Alerts" in operator specific
-     * variant.
-     * @return 0: enabled (MusSettingsKeys::EAuditoryNotificationOn)
-     *         1: disabled (MusSettingsKeys::EAuditoryNotificationOff)
-     */
-    MusSettingsKeys::TAuditoryNotification VSSettingsNoteL();
-
-    /**
-     * Sets packet data VS activation mode.
-     * @param aActivation Activation mode.
-     */
-    void SetVSSettingsActivationL(
-    		const MusSettingsKeys::TActivation aActivation );
-
-    /**
-     * Sets SIP profile mode.
-     * @param aProfile Profile id.
-     */
-    void SetVSSettingsProfileL( const TInt aProfile );
-
-    /**
-     * Sets video autorecord mode.
-     * @param aAutoRecord save mode of video.
-     */
-    void SetVSSettingsAutoRecordL(
-    		const MusSettingsKeys::TAutoRecord aAutoRecord );
-
-    /**
-    * Sets location of video saving.
-    * @param aVideoLocation location of video
-    */
-    void SetVSSettingsRecordedVideoSavingL( const TInt aVideoLocation );
-
-    /**
-     * Sets mode of note ("Capability auditory note" in standard variant and
-     * "Alerts" in operator specific variant).
-     * @param aValue New state for note (enabled/disabled).
-     */
-    void SetVSSettingsNoteL(
-    		const MusSettingsKeys::TAuditoryNotification aValue );
-    
     
     /**
      * operator specific variant
@@ -139,12 +63,12 @@
      */
     void SetActivationItem( TBool aActive );
 
-
     /**
      * operator specific variant
      * @return activation item 
      */
     TBool ActivationItem( );
+    
     /**
      * Returns the array containing the profile names.
      * NOTE! The ownership of the array is transferred to the caller.
@@ -233,12 +157,6 @@
      * SIP profile handler.
      */
     MMusSIPProfileHandler& iHandler;
-
-    /**
-     * Central repository keys of video sharing.
-     * Own.
-     */
-    MultimediaSharingSettings* iMSSettingsKeys;
     
     /**
      * Operator variant. If SIP profile disabled