diff -r 33a5d2bbf6fc -r 73a1feb507fb mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h
--- a/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h	Thu Aug 19 09:51:39 2010 +0300
+++ b/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h	Tue Aug 31 15:12:07 2010 +0300
@@ -12,7 +12,6 @@
 * Contributors:
 *
 * Description:  MUSSettingsPlugin model class.
-*  Version     : %version: 11 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -21,17 +20,20 @@
 #ifndef  C_MUSSETTINGSMODEL_H
 #define  C_MUSSETTINGSMODEL_H
 
-#include <e32base.h>
-#include <badesca.h>
+#include 	"mussettings.h"
 
 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
     {
@@ -50,52 +52,111 @@
     ~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();
-    
+
     /**
-     * operator specific variant
-     * Sets activation item 
-     * @param aActive (enabled/disabled).
+     * 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)
      */
-    void SetActivationItem( TBool aActive );
+    MusSettingsKeys::TAuditoryNotification VSSettingsNoteL();
+
+    /**
+     * Sets packet data VS activation mode.
+     * @param aActivation Activation mode.
+     */
+    void SetVSSettingsActivationL(
+    		const MusSettingsKeys::TActivation aActivation );
 
     /**
-     * operator specific variant
-     * @return activation item 
+     * Sets SIP profile mode.
+     * @param aProfile Profile id.
+     */
+    void SetVSSettingsProfileL( const TInt aProfile );
+
+    /**
+     * Sets video autorecord mode.
+     * @param aAutoRecord save mode of video.
      */
-    TBool ActivationItem();
-    
+    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 );
+
     /**
      * Returns the array containing the profile names.
      * NOTE! The ownership of the array is transferred to the caller.
      * @return Array consisting of the names of the SIP profiles.
      */
-    CDesCArray* ListOfProfileNamesL();
+	CDesCArray* ListOfProfileNamesL();
 
     /**
      * Gets a SIP profile name by ID.
      * Ownership is transferred to caller.
      * @return SIP profile name.
      */
-    HBufC* ProfileNameL( TInt aId );
+	HBufC* ProfileNameL( TInt aId );
 
     /**
      * Gets the index of the default SIP profile.
      * @return KErrNotFound, if one does not exist, otherwise index of the
      *         default SIP profile.
      */
-    TInt DefaultProfileIndex();
+	TInt DefaultProfileIndex();
 
     /**
      * Gets the id of the default SIP profile.
      * @return KErrNotFound, if one does not exist, otherwise id of the
      *         default SIP profile.
      */
-    TUint32 DefaultProfileId();
+	TUint32 DefaultProfileId();
 
     /**
      * Returns SIP profile index on locally cached array based on id.
@@ -118,27 +179,23 @@
      */
     CAknMemorySelectionDialogMultiDrive* MemorySelectionDialogLC();
 
-    /**
-    * Initialize SIP profile enabler data.
-    */
-    void InitializeProfileEnablerL();
     
 public: // constants
 
     /**
      * Default SIP profile.
      */
-    static const TInt KVsSipProfileDefault;
-    
+	static const TInt KVsSipProfileDefault;
+
     /**
      * SIP profile select.
      */
-    static const TInt KVsSipProfileSelect;
+	static const TInt KVsSipProfileSelect;
 
     /**
      * Null selection SIP profile.
      */
-    static const TInt KVsSipProfileSelectNone;
+	static const TInt KVsSipProfileSelectNone;
 
 private:
 
@@ -147,7 +204,7 @@
      * @param aHandler Reference to SIP profile manipulator.
      */
     CMusSettingsModel( MMusSIPProfileHandler& aHandler );
-    
+
     void ConstructL();
 
 private: // data
@@ -156,11 +213,12 @@
      * SIP profile handler.
      */
     MMusSIPProfileHandler& iHandler;
-    
+
     /**
-     * Operator variant. If SIP profile disabled
+     * Central repository keys of video sharing.
+     * Own.
      */
-    TBool iProfileDisabled;
+    MultimediaSharingSettings* iMSSettingsKeys;
 
     };