--- a/tsrc/telephonyaudioroutingstub/inc/telephonyaudiorouting.h	Thu Aug 19 09:51:39 2010 +0300
+++ b/tsrc/telephonyaudioroutingstub/inc/telephonyaudiorouting.h	Tue Aug 31 15:12:07 2010 +0300
@@ -56,7 +56,7 @@
         static CTelephonyAudioRouting* NewL(
                             MTelephonyAudioRoutingObserver& aObserver );
                             
-        virtual ~CTelephonyAudioRouting();
+        ~CTelephonyAudioRouting();
 
         /**
         * Returns array of currently available outputs.
@@ -74,7 +74,7 @@
         * @param none.
         * @return TArray<TAudioOutput>& Array of available outputs.
         */     
-        virtual const TArray<TAudioOutput>& AvailableOutputs();
+        const TArray<TAudioOutput>& AvailableOutputs();
 
         /**
         * Returns the current output configured by the client application to play
@@ -94,7 +94,7 @@
         * @param none.
         * @return TAudioOutput Current output.
         */       
-        virtual TAudioOutput Output();
+        TAudioOutput Output();
 
         /**
         * Sends an asynchronous request to Adaptation to set the output
@@ -118,7 +118,7 @@
         *           of the outputs from AvailableOutputs() list or ENotActive.
         * @return none.
         */
-        virtual void SetOutputL( TAudioOutput aOutput = ENotActive );
+        void SetOutputL( TAudioOutput aOutput = ENotActive );
         
         /**
         * Returns the second last output that was successfully configured to
@@ -137,7 +137,7 @@
         *           audio. ENone will never be returned since telephony apps cannot call
         *           SetOutputL(ENone).
         */
-        virtual TAudioOutput PreviousOutput();
+        TAudioOutput PreviousOutput();
 
         /*
         * Sends the Show Note mode to server along with the next SetOutputL()
@@ -155,7 +155,7 @@
         * @param TBool aMode Show Note mode. ETrue or EFalse.
         * @return KErrNone if succesfull, otherwise system-wide error code.
         */
-        virtual TInt SetShowNote( TBool aMode );
+        TInt SetShowNote( TBool aMode );
         
         /*
         * Returns the the Show Note mode for the last succesfully completed
@@ -182,7 +182,7 @@
         *        Show Note mode. EFalse or ETrue.
         * @return KErrNone if succesfull, otherwise system-wide error code.
         */
-        virtual TInt GetShowNote( TBool& aMode );    
+        TInt GetShowNote( TBool& aMode );    
     
     private:
     
@@ -194,8 +194,8 @@
         MTelephonyAudioRoutingObserver& iObserver;
     
         RArray<TAudioOutput> iAvailableOutputs;
-        static TAudioOutput iCurrentOutput;
-        static TAudioOutput iPreviousOutput;
+        TAudioOutput iCurrentOutput;
+        TAudioOutput iPreviousOutput;
     
         TBool iShowNoteMode;