From a80d026517f6318f7dadc428c09e4f97d2511c54 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 1 Sep 2011 17:30:09 +0000
Subject: [PATCH] Fix clang warnings in voice engine. Review URL:
 http://webrtc-codereview.appspot.com/133008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@512 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/voice_engine/main/source/channel.h         | 18 ------------------
 .../main/test/auto_test/voe_standard_test.h    | 12 ++++++------
 .../main/test/auto_test/voe_stress_test.h      |  8 +++-----
 .../main/test/auto_test/voe_test_interface.h   |  7 +++----
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/voice_engine/main/source/channel.h b/src/voice_engine/main/source/channel.h
index 23a2dcfeda..9acddadf2e 100644
--- a/src/voice_engine/main/source/channel.h
+++ b/src/voice_engine/main/source/channel.h
@@ -409,30 +409,12 @@ public:
 
 public:
     // From RtcpFeedback in the RTP/RTCP module
-    void OnLipSyncUpdate(const WebRtc_Word32 id,
-                         const WebRtc_Word32 audioVideoOffset) {};
-
     void OnApplicationDataReceived(const WebRtc_Word32 id,
                                    const WebRtc_UWord8 subType,
                                    const WebRtc_UWord32 name,
                                    const WebRtc_UWord16 length,
                                    const WebRtc_UWord8* data);
 
-    void OnRTCPPacketTimeout(const WebRtc_Word32 id) {} ;
-
-    void OnTMMBRReceived(const WebRtc_Word32 id,
-                         const WebRtc_UWord16 bwEstimateKbit) {};
-
-    void OnSendReportReceived(const WebRtc_Word32 id,
-                              const WebRtc_UWord32 senderSSRC,
-                              const WebRtc_UWord8* packet,
-                              const WebRtc_UWord16 packetLength) {};
-
-    void OnReceiveReportReceived(const WebRtc_Word32 id,
-                                 const WebRtc_UWord32 senderSSRC,
-                                 const WebRtc_UWord8* packet,
-                                 const WebRtc_UWord16 packetLength) {};
-
 public:
     // From RtpAudioFeedback in the RTP/RTCP module
     void OnReceivedTelephoneEvent(const WebRtc_Word32 id,
diff --git a/src/voice_engine/main/test/auto_test/voe_standard_test.h b/src/voice_engine/main/test/auto_test/voe_standard_test.h
index a3756a134c..39ef357651 100644
--- a/src/voice_engine/main/test/auto_test/voe_standard_test.h
+++ b/src/voice_engine/main/test/auto_test/voe_standard_test.h
@@ -130,9 +130,9 @@ public:
     {
         counter = 0;
     }
-    virtual void OnReceivedTelephoneEventInband(const int channel,
-                                                const unsigned char eventCode,
-                                                const bool endOfEvent)
+    virtual void OnReceivedTelephoneEventInband(int channel,
+                                                int eventCode,
+                                                bool endOfEvent)
     {
         char msg[128];
         if (endOfEvent)
@@ -146,9 +146,9 @@ public:
     }
 
     virtual void OnReceivedTelephoneEventOutOfBand(
-        const int channel,
-        const unsigned char eventCode,
-        const bool endOfEvent)
+        int channel,
+        int eventCode,
+        bool endOfEvent)
     {
         char msg[128];
         if (endOfEvent)
diff --git a/src/voice_engine/main/test/auto_test/voe_stress_test.h b/src/voice_engine/main/test/auto_test/voe_stress_test.h
index 69b309f078..aab4535726 100644
--- a/src/voice_engine/main/test/auto_test/voe_stress_test.h
+++ b/src/voice_engine/main/test/auto_test/voe_stress_test.h
@@ -11,16 +11,14 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H
 #define WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H
 
-namespace webrtc
-{
+namespace webrtc {
 class ThreadWrapper;
 }
 
+namespace voetest {
+// TODO(andrew): using directives are not permitted.
 using namespace webrtc;
 
-namespace voetest
-{
-
 class VoETestManager;
 
 class VoEStressTest
diff --git a/src/voice_engine/main/test/auto_test/voe_test_interface.h b/src/voice_engine/main/test/auto_test/voe_test_interface.h
index cdfe783953..3ce7298d2d 100644
--- a/src/voice_engine/main/test/auto_test/voe_test_interface.h
+++ b/src/voice_engine/main/test/auto_test/voe_test_interface.h
@@ -17,17 +17,16 @@
 
 #include "common_types.h"
 
-namespace webrtc
-{
+namespace webrtc {
 class CriticalSectionWrapper;
 class EventWrapper;
 class ThreadWrapper;
 class VoENetwork;
 }
 
-using namespace webrtc;
-
 namespace voetest {
+// TODO(andrew): using directives are not permitted.
+using namespace webrtc;
 
 // TestType enumerator
 enum TestType