--- a/mmmw_plat/voip_audio_services_api/inc/voipdatabuffer.h	Fri Sep 03 19:34:12 2010 -0500
+++ b/mmmw_plat/voip_audio_services_api/inc/voipdatabuffer.h	Tue Sep 21 11:38:43 2010 -0500
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef __VOIPDATABUFFER_H
-#define __VOIPDATABUFFER_H
+#ifndef VOIPDATABUFFER_H
+#define VOIPDATABUFFER_H
 
 #include <e32base.h>
 
@@ -44,8 +44,6 @@
 public:
     /**
      * Destructor
-     *
-     * @since S60 v5.0
      * @param none
      * @return none
      */
@@ -53,8 +51,6 @@
 
     /**
      * SetPayloadPtr
-     *
-     * @since S60 v5.0
      * @param TPtr8
      * @return none
      */
@@ -62,8 +58,6 @@
 
     /**
      * GetPayloadPtr
-     *
-     * @since S60 v5.0
      * @param TPtr8&
      * @return none
      */
@@ -71,8 +65,6 @@
 
     /**
      * GetBufferType
-     *
-     * @since S60 v5.0
      * @param TVoIPBufferType&
      * @return none
      */
@@ -81,8 +73,6 @@
 protected:
     /**
      * Constructor
-     *
-     * @since S60 v5.0
      * @param none
      * @return none
      */
@@ -90,8 +80,6 @@
 
     /**
      * 2nd phase constructor
-     *
-     * @since S60 v5.0
      * @param CVoIPDataBufferImpl*
      * @return void
      */
@@ -100,7 +88,6 @@
 private:
 
     CVoIPDataBufferImpl* iVoIPDataBufferImpl;
-
     };
 
 /**
@@ -113,8 +100,6 @@
 public:
     /**
      * Destructor
-     *
-     * @since S60 v5.0
      * @param none
      * @return none
      */
@@ -122,8 +107,6 @@
 
     /**
      * SetBufferSequence
-     *
-     * @since S60 v5.0
      * @param const TUint - between 0 and 0xFFFF
      * @return none
      */
@@ -131,8 +114,6 @@
 
     /**
      * GetBufferSequence
-     *
-     * @since S60 v5.0
      * @param TUint& - between 0 and 0xFFFF
      * @return none
      */
@@ -141,8 +122,6 @@
 protected:
     /**
      * Constructor
-     *
-     * @since S60 v5.0
      * @param none
      * @return none
      */
@@ -150,8 +129,6 @@
 
     /**
      * 2nd phase constructor
-     *
-     * @since S60 v5.0
      * @param CVoIPJBDataBufferImpl*
      * @return void
      */
@@ -160,9 +137,8 @@
 private:
 
     CVoIPJBDataBufferImpl* iVoIPJBDataBufferImpl;
-
     };
 
-#endif //__VOIPDATABUFFER_H
+#endif //VOIPDATABUFFER_H
 
 // End of file