diff -r 4a629bc82c5e -r b67dd1fc57c5 mmserv/tms/tmsserver/inc/tmsaudiotoneutilityimpl.h
--- a/mmserv/tms/tmsserver/inc/tmsaudiotoneutilityimpl.h	Fri Apr 30 19:18:45 2010 -0500
+++ b/mmserv/tms/tmsserver/inc/tmsaudiotoneutilityimpl.h	Fri May 14 18:19:45 2010 -0500
@@ -20,6 +20,7 @@
 
 #include <e32base.h>
 #include <mdaaudiotoneplayer.h>
+#include <glib.h>
 #include "tmsaudiotoneutility.h"
 
 namespace TMS {
@@ -35,7 +36,7 @@
 public:
 
     static TMSAudioToneUtilityImpl* NewL(
-            MMdaAudioToneObserver& aToneObserver);
+            MMdaAudioToneObserver& toneObserver);
 
     /**
      * Destructor.
@@ -48,7 +49,7 @@
      * From TMSAudioToneUtilityImpl
      * @see CMdaAudioToneUtility
      */
-    void PrepareToPlayDesSequence(const TDesC8& aSequence);
+    void PrepareToPlayDesSequence(const TDesC8& sequence);
 
     /**
      * From TMSAudioToneUtilityImpl
@@ -66,32 +67,32 @@
      * From TMSAudioToneUtilityImpl
      * @see CMdaAudioToneUtility
      */
-    TInt MaxVolume();
+    gint MaxVolume();
 
     /**
      * From TMSAudioToneUtilityImpl
      * @see CMdaAudioToneUtility
      */
-    void SetVolume(TInt aVolume);
+    void SetVolume(gint volume);
 
     /**
      * From TMSAudioToneUtilityImpl
      * @see CMdaAudioToneUtility
      */
-    void SetRepeats(TInt aRepeatNumberOfTimes,
-            const TTimeIntervalMicroSeconds& aTrailingSilence);
+    void SetRepeats(gint repeatNumberOfTimes,
+            const TTimeIntervalMicroSeconds& trailingSilence);
 
     /**
      * From TMSAudioToneUtilityImpl
      * @see CMdaAudioToneUtility
      */
-    void SetPriority(TInt aPriority, TMdaPriorityPreference aPref);
+    void SetPriority(gint priority, TMdaPriorityPreference pref);
 
     /**
      * From TMSAudioToneUtilityImpl
      * @see CMdaAudioToneUtility
      */
-    void SetVolumeRamp(const TTimeIntervalMicroSeconds& aRampDuration);
+    void SetVolumeRamp(const TTimeIntervalMicroSeconds& rampDuration);
 
     /**
      * From TMSAudioToneUtilityImpl
@@ -109,7 +110,7 @@
 
     TMSAudioToneUtilityImpl();
 
-    void ConstructL(MMdaAudioToneObserver& aToneObserver);
+    void ConstructL(MMdaAudioToneObserver& toneObserver);
 
 private:
     // data