diff -r a493a607b5bf -r eabc8c503852 mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/inc/TimeoutController.h
--- a/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/inc/TimeoutController.h	Fri Sep 03 19:34:12 2010 -0500
+++ b/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/inc/TimeoutController.h	Tue Sep 21 11:38:43 2010 -0500
@@ -1,136 +1,106 @@
 /*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: voip audio service -  Simple player for preemption purposes
-*
-*/
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Voip Audio Service - Stif test
+ *
+ */
 
+#ifndef TIMEOUTCONTROLLER_H
+#define TIMEOUTCONTROLLER_H
 
 #include <e32svr.h>
 #include <StifParser.h>
 #include <StifLogger.h>
 #include <Stiftestinterface.h>
 
-
 /* This class is used to notify the observer
-*  about the timeout
-*/
+ *  about the timeout
+ */
 class MTimeoutObserver
-{
-    public: // New functions
-
+    {
+public:
     /**
-    * Timeout
-    */
+     * Timeout
+     */
     virtual void HandleTimeout(TInt error) = 0;
-};
-
+    };
 
 _LIT(KFormatTimeStamp, "%:0%J%:1%T%:2%S%.%*C4%:3%+B");
 
-
 /* This class is used for extra time controlling
-*  The STIF timeout isn't enough
-*/
+ *  The STIF timeout isn't enough
+ */
 class CSimpleTimeout : public CActive
-{
-    public:     // Enumerations
-    // None
-
-    private:    // Enumerations
-    // None
-
-    public:     // Constructors and destructor
+    {
+public:
 
     /**
-    * Two-phased constructor.
-    */
-    static CSimpleTimeout* NewL( MTimeoutObserver* aObserver, CStifLogger* aLogger);
+     * Two-phased constructor.
+     */
+    static CSimpleTimeout* NewL(MTimeoutObserver* aObserver,
+            CStifLogger* aLogger);
 
     /**
-    * Destructor.
-    */
+     * Destructor.
+     */
     ~CSimpleTimeout();
 
-    public:     // New functions
-
     /**
-    * Starts timeout counting
-    */
+     * Starts timeout counting
+     */
     void Start(TTimeIntervalMicroSeconds aTimeout);
 
     /**
-    * Cancel timeout counting
-    */
+     * Cancel timeout counting
+     */
     void Stop();
 
-
-    public:     // Functions from base classes
-
     /**
-    * RunL derived from CActive handles the completed requests.
-    */
+     * RunL derived from CActive handles the completed requests.
+     */
     void RunL();
 
     /**
-    * DoCancel derived from CActive handles the cancel
-    */
+     * DoCancel derived from CActive handles the cancel
+     */
     void DoCancel();
 
     /**
-    * RunError derived from CActive handles errors from active handler.
-    */
-    TInt RunError( TInt aError );
+     * RunError derived from CActive handles errors from active handler.
+     */
+    TInt RunError(TInt aError);
 
-    protected:  // New functions
-    // None
-
-    protected:  // Functions from base classes
-    // None
-
-    private:
+private:
 
     /**
-    * By default Symbian OS constructor is private.
-    */
+     * By default Symbian OS constructor is private.
+     */
     void ConstructL(MTimeoutObserver* aObserver, CStifLogger* aLogger);
 
     /**
-    * C++ constructor.
-    */
+     * C++ constructor.
+     */
     CSimpleTimeout();
 
-    public:     // Data
-    // None
-
-    protected:  // Data
-    // None
-
-    private:    // Data
-    MTimeoutObserver*   iObserver;
-    RTimer                        iTimer;
+private:
+    // Data
+    MTimeoutObserver* iObserver;
+    RTimer iTimer;
 
     // Storage for testcase timeout.
-    TTime                       iTestCaseTimeout;
-    CStifLogger*                iLog;
-
-    public:     // Friend classes
-    // None
+    TTime iTestCaseTimeout;
+    CStifLogger* iLog;
+    };
 
-    protected:  // Friend classes
-    // None
+#endif //TIMEOUTCONTROLLER_H
 
-    private:    // Friend classes
-    // None
-
-};