--- a/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.h Tue Aug 31 15:29:50 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.h Wed Sep 01 12:20:44 2010 +0100
@@ -22,8 +22,8 @@
// INCLUDES
#include <e32base.h>
-#include <MProfileExtraTones2.h>
-#include <MProfileSetExtraTones2.h>
+#include <MProfileExtraTones.h>
+#include <MProfileSetExtraTones.h>
// FORWARD DECLARATIONS
class RWriteStream;
@@ -38,8 +38,8 @@
* @since 2.0
*/
NONSHARABLE_CLASS(CProfileExtraTonesImpl) : public CBase,
- public MProfileExtraTones2,
- public MProfileSetExtraTones2
+ public MProfileExtraTones,
+ public MProfileSetExtraTones
{
public: // Constructors and destructor
@@ -53,7 +53,7 @@
* @param aProfileExtraTones Profile extra tones
*/
static CProfileExtraTonesImpl* NewL(
- const MProfileExtraTones2& aProfileExtraTones );
+ const MProfileExtraTones& aProfileExtraTones );
/**
* Destructor.
@@ -111,28 +111,6 @@
*/
virtual void SetVideoCallRingingToneL(
const TDesC& aRingingTone );
-
- /**
- * From MProfileExtraTones2.
- */
- virtual const TDesC& ReminderTone() const;
-
- /**
- * From MProfileSetExtraTones2.
- */
- virtual void SetReminderToneL(
- const TDesC& aReminderTone );
-
- /**
- * From MProfileExtraTones2.
- */
- virtual const TDesC& ClockAlarmTone() const;
-
- /**
- * From MProfileSetExtraTones2.
- */
- virtual void SetClockAlarmToneL(
- const TDesC& aClockAlarmTone );
private:
@@ -145,7 +123,7 @@
* By default Symbian 2nd phase constructor is private.
* @param aProfileExtraTones Profile extra tones
*/
- void ConstructL( const MProfileExtraTones2& aProfileExtraTones );
+ void ConstructL( const MProfileExtraTones& aProfileExtraTones );
private: // Data
@@ -157,12 +135,6 @@
// Own: Video call ringing tone file name
HBufC* iVideoCallRingingTone;
-
- //Own: Reminder tone file name
- HBufC* iReminderTone;
-
- //Own: Clock alarm tone file name
- HBufC* iClockAlarmTone;
};
#endif // __CPROFILEEXTRATONESIMPL_H