--- a/tsrc/CenrepEditor/inc/cenrepeditormodel.h	Thu Aug 19 09:51:39 2010 +0300
+++ b/tsrc/CenrepEditor/inc/cenrepeditormodel.h	Tue Aug 31 15:12:07 2010 +0300
@@ -40,22 +40,13 @@
 		static COtherResources* NewL();
 		static COtherResources* NewLC();
 		~COtherResources();       
-    public :
+    
+	public:
     
         void SaveL();
-        void SaveCRKeyValuesL();
-        void ReadL();
-        void ReadCRKeyValuesL();
-        void ReadKeyValueL(CRepository* repository, const TInt & aKey , TInt & aVal);
-        void SetKeyValueL(CRepository* repository, const TInt & aKey , TInt & aVal);
-
-        void ReadKeyValueL(CRepository* repository, TInt aKey, TDes& aVal);
-        void SetKeyValueL(CRepository* repository, TInt aKey, const TDesC& aVal);
-
-    private : 
-        void HandleError(TBool aType ,TInt aError , TPtrC aKeyName );
 
     public:
+        
         TInt iActivation;
         TInt iOperatorVariant;
         TInt iAuditoryNotification;
@@ -69,15 +60,22 @@
         TInt iUiOrientation; 
         TInt iCapabilityQuery;  
         TInt iProductModeVariation;
-        TInt iEncodingDevice;  
-        TInt iPrivacyVariation;
-        TInt iDummy; 
-
+        TInt iEncodingDevice;
+        TInt iOnlyWithActiveCSCall;
+        TInt iOnlyIn3GNetwork;
         TBuf<NCentralRepositoryConstants::KMaxBinaryLength>  iEncoderInfo;
         TBuf<KMaxUidStringLength> iEncodingDeviceStr;
+        TInt iCameraUsage;
+        TInt iVideoDirection;
+        TInt iVideoBandwidth;
+        TInt iFastMode;
         
-    private :
+    private:
         void ConstructL();
+        void SetKeyValueL(const TUint32& aKey , TInt& aVal);
+        
+    private:
+        CRepository* iRepository;
 	};
 
 class CPhoneResources : public CBase
@@ -86,22 +84,20 @@
 		static CPhoneResources* NewL();
 		static CPhoneResources* NewLC();
 		~CPhoneResources();       
-    public :
+    
+	public :
         void SaveL();
-        void ReadL();        
-    private :
-        void HandleError(TBool aType ,TInt aError , TPtrC aKeyName );
+    
     public:
         TInt iCameraAvailability;
         TInt iKeypadAvailability;
         TInt iVideoPlayerAvailability;
         TInt iCameraInformation;
         TInt iKodiakPhoneCall;
-        TInt iDummy; 
 
     private :
         void ConstructL();
-        TInt SetValueL(TUid aCategory, TUint aKey, TInt aValue);
+        void SetValueL(TUid aCategory, TUint aKey, TInt aValue);
 	};
 
 class CMusApplication : public CBase