--- a/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp Tue Aug 31 16:29:05 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp Wed Sep 01 12:34:26 2010 +0100
@@ -316,7 +316,7 @@
// CAccSrvServerModel::RemovePhysicalConnectionL
// -----------------------------------------------------------------------------
//
-TInt CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID )
+void CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID )
{
COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection()" );
@@ -329,9 +329,7 @@
iPhysicalConnectionArray.Remove( index );
}
- COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return %d", index );
-
- return index;
+ COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return void" );
}
// -----------------------------------------------------------------------------
@@ -503,43 +501,6 @@
COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::GetLastConnectedAccessoryL - return" );
}
-
-// -----------------------------------------------------------------------------
-// CAccSrvServerModel::GetLastConnectedWiredAccessory
-//
-// Last connected wired accessory is to be searched in the iConnectionArray
-// -----------------------------------------------------------------------------
-//
-TBool CAccSrvServerModel::GetLastConnectedWiredAccessory( TAccPolGenericID& aGenericID ) const
- {
- COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::GetLastConnectedWiredAccessoryL()" );
-
- TInt arrCount = 0;
-
- if ( (arrCount = iConnectionArray.Count()) != 0 )
- {
- TUint arrIndex = 0;
- TAccPolGenericID iGenericID;
-
- while(arrIndex < arrCount)
- {
- iGenericID = iConnectionArray[arrIndex];
-
- if( iGenericID.PhysicalConnectionCaps(KPCWired) )
- {
- aGenericID = iGenericID;
- return ETrue;
- }
- arrIndex++;
- }
- }
-
- COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::GetLastConnectedWiredAccessory - return" );
-
- return EFalse;
-
- }
-
// -----------------------------------------------------------------------------
// CAccSrvServerModel::SetAccessoryMode