--- a/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/src/AccMonConnectionEmulator.cpp	Tue Aug 31 16:29:05 2010 +0300
+++ b/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/src/AccMonConnectionEmulator.cpp	Wed Sep 01 12:34:26 2010 +0100
@@ -98,10 +98,10 @@
     TPckgBuf< TTFAccessoryPublishAndSubscribe > buf;
     
     // Reset the values and then order the connect
-    TTFASYReference method( ETFAsyNone );
+    TTFASYReference method;
     TInt64 param1( 0 );
     TBool wired( EFalse );
-    TUint64 btaddress( 0 );
+    TUint64 btaddress;
     RArray< TUint32 > capabilityArray;
     TUint8 deviceType;
     
@@ -192,6 +192,7 @@
         {
 #ifdef TEST_BT
         TBTDevAddr btaddr( btaddress );
+        TBool oldTest( EFalse );
         TRequestStatus status;
         RAccessoryServer server;
         server.Connect();
@@ -321,10 +322,10 @@
     TPckgBuf< TTFAccessoryPublishAndSubscribe > buf;
     
     // Reset the values and then order the connect
-    TTFASYReference method( ETFAsyNone );
+    TTFASYReference method;
     TInt64 param1( 0 );
     TBool wired( EFalse );
-    TUint64 btaddress( 0 );
+    TUint64 btaddress;
     RArray< TUint32 > capabilityArray;
     
     switch( aAccDefintion )
@@ -443,11 +444,13 @@
     
     if( aAccInfo->AccPhysicalConnection() == KAccMonWired )
         {
+        TInt err( KErrNone );
         TPckgBuf< TTFAccessoryPublishAndSubscribe > buf;
         
         // Reset the values and then order the connect
         TTFASYReference method;
         TInt64 param1( 0 );
+        TBool wired( EFalse );
         RArray< TUint32 > capabilityArray;
         
         method = ETFAsyDisc;
@@ -513,5 +516,4 @@
     return retval;
     }
   
-// End of file
-
+// End of file
\ No newline at end of file