diff -r 73a1feb507fb -r bc78a40cd63c mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h
--- a/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h	Wed Sep 01 12:31:01 2010 +0100
@@ -12,6 +12,7 @@
 * Contributors:
 *
 * Description:  MUSSettingsPlugin model class.
+*  Version     : %version: 11 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -20,20 +21,17 @@
 #ifndef  C_MUSSETTINGSMODEL_H
 #define  C_MUSSETTINGSMODEL_H
 
-#include 	"mussettings.h"
+#include <e32base.h>
+#include <badesca.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
     {
@@ -52,111 +50,52 @@
     ~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)
+     * operator specific variant
+     * Sets activation item 
+     * @param aActive (enabled/disabled).
      */
-    MusSettingsKeys::TAuditoryNotification VSSettingsNoteL();
-
-    /**
-     * Sets packet data VS activation mode.
-     * @param aActivation Activation mode.
-     */
-    void SetVSSettingsActivationL(
-    		const MusSettingsKeys::TActivation aActivation );
+    void SetActivationItem( TBool aActive );
 
     /**
-     * Sets SIP profile mode.
-     * @param aProfile Profile id.
-     */
-    void SetVSSettingsProfileL( const TInt aProfile );
-
-    /**
-     * Sets video autorecord mode.
-     * @param aAutoRecord save mode of video.
+     * operator specific variant
+     * @return activation item 
      */
-    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 );
-
+    TBool ActivationItem();
+    
     /**
      * 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.
@@ -179,23 +118,27 @@
      */
     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:
 
@@ -204,7 +147,7 @@
      * @param aHandler Reference to SIP profile manipulator.
      */
     CMusSettingsModel( MMusSIPProfileHandler& aHandler );
-
+    
     void ConstructL();
 
 private: // data
@@ -213,12 +156,11 @@
      * SIP profile handler.
      */
     MMusSIPProfileHandler& iHandler;
-
+    
     /**
-     * Central repository keys of video sharing.
-     * Own.
+     * Operator variant. If SIP profile disabled
      */
-    MultimediaSharingSettings* iMSSettingsKeys;
+    TBool iProfileDisabled;
 
     };