--- a/profilesservices/ProfileEngine/EngSrc/CProfileImpl.h Tue Aug 31 15:29:50 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileImpl.h Wed Sep 01 12:20:44 2010 +0100
@@ -22,7 +22,7 @@
// INCLUDES
#include <e32base.h>
-#include <MProfileExtended2.h>
+#include <MProfileExtended.h>
#include <centralrepository.h> // NCentralRepositoryConstants::KMaxBinaryLength
// CONSTANTS
@@ -40,7 +40,6 @@
class MProfilesNamesArray;
class MProfilesLocalFeatures;
struct TProfilePresenceSettings;
-class CProfileVibraSettingsImpl;
// CLASS DECLARATION
@@ -51,7 +50,7 @@
* @since 2.0
*/
NONSHARABLE_CLASS(CProfileImpl) : public CBase,
- public MProfileExtended2
+ public MProfileExtended
{
public: // Constructors and destructor
@@ -74,7 +73,7 @@
* @param aId Profile ID
*/
static CProfileImpl* NewLC(
- RFs& aFs, const MProfileExtended2& aProfile, TInt aId );
+ RFs& aFs, const MProfileExtended& aProfile, TInt aId );
/**
* Destructor.
@@ -198,27 +197,6 @@
* From MProfileExtended.
*/
virtual MProfileSetExtraSettings& ProfileSetExtraSettings() const;
-
-
- /**
- * From MProfileExtended2.
- */
- virtual const MProfileExtraTones2& ProfileExtraTones2() const;
-
- /**
- * From MProfileExtended2.
- */
- virtual MProfileSetExtraTones2& ProfileSetExtraTones2();
-
- /**
- * From MProfileExtended2.
- */
- virtual const MProfileVibraSettings& ProfileVibraSettings() const;
-
- /**
- * From MProfileExtended2.
- */
- virtual MProfileSetVibraSettings& ProfileSetVibraSettings();
/**
* Externalize data to Central Repository.
@@ -245,7 +223,7 @@
* @param aProfile Profile settings
* @param aId Profile ID
*/
- void ConstructL( const MProfileExtended2& aProfile, TInt aId );
+ void ConstructL( const MProfileExtended& aProfile, TInt aId );
/**
* This method does the common part of the construction.
@@ -271,9 +249,6 @@
// Own: Profile presence settings implementation
CProfilePresenceImpl* iProfilePresence;
-
- // Own: Profile vibra settings implementation
- CProfileVibraSettingsImpl *iProfileVibraSettings;
// Own: Profile modifiable flags
TUint32 iModifiableFlags;