--- a/intercom/intercomd.cpp	Fri Jun 25 09:57:52 2010 +0200
+++ b/intercom/intercomd.cpp	Fri Jun 25 09:59:25 2010 +0200
@@ -89,19 +89,19 @@
 /* EFR stubs - because of function name conflict in EFR and G.729 */
 class EFR {
 public:
-  int EFR::initEncode(int dtx_mode_) {
+  int initEncode(int dtx_mode_) {
     return 0;
   };
-  int EFR::encode(              /* (o) len in byte of encoded_data */
+  int encode(              /* (o) len in byte of encoded_data */
     Byte * encoded_data,        /* (o) The encoded bytes */
     Word16 * data               /* (i) The signal block to encode */
     ) {
     return 0;
   };
-  int EFR::initDecode() {
+  int initDecode() {
     return 0;
   };
-  int EFR::decode(              /* (o) Number of decoded samples or 0 for error */
+  int decode(              /* (o) Number of decoded samples or 0 for error */
     Word16 * decoded_data,      /* (o) Decoded signal block */
     Byte * encoded_data,        /* (i) Encoded bytes */
     Word16 mode                 /* (i) 0=PL, 1=Normal */
@@ -119,21 +119,21 @@
 /* G.729 stubs - because of function name conflict in EFR and G.729 */
 class G729 {
 public:
-  int G729::initEncode(int dummy) {
+  int initEncode(int dummy) {
     return 0;
   };
 
-  int G729::encode(             /* len in byte of encoded_data */
+  int encode(             /* len in byte of encoded_data */
     Byte * encoded_data,        /* (o) The encoded bytes */
     Word16 * data               /* (i) The signal block to encode */
     ) {
     return 0;
   };
-  int G729::initDecode() {
+  int initDecode() {
     return 0;
   };
 
-  int G729::decode(             /* (o) Number of decoded samples */
+  int decode(             /* (o) Number of decoded samples */
     Word16 * decoded_data,      /* (o) Decoded signal block */
     Byte * encoded_data,        /* (i) Encoded bytes */
     Word16 mode                 /* (i) 0=PL, 1=Normal */