diff -r 09b1ac925e3f -r 03674e5abf46 gba/gbaserver/src/dataretriever.cpp --- a/gba/gbaserver/src/dataretriever.cpp Tue Aug 31 16:04:40 2010 +0300 +++ b/gba/gbaserver/src/dataretriever.cpp Wed Sep 01 12:19:59 2010 +0100 @@ -21,9 +21,10 @@ #include #include #include +#include #include #include -#include +#include #include #include "dataretriever.h" #include "GbaCommon.h" @@ -102,7 +103,7 @@ { iHttpHandler = C3GPPBootstrapHttpHandler::NewL( this, iBootstrapCallBack ); iInternalState = EReadyForRequest; - iCmManager.OpenL(); + iCmManagerExt.OpenL(); } @@ -119,7 +120,7 @@ iHTTPSession.Close(); iConnection.Close(); iSockServ.Close(); - iCmManager.Close(); + iCmManagerExt.Close(); if ( iInternalState == EMakeRequestCalled ) { @@ -355,11 +356,11 @@ RArray destIdArray; CleanupClosePushL( destIdArray ); CleanupCounter++; - iCmManager.AllDestinationsL( destIdArray ); + iCmManagerExt.AllDestinationsL( destIdArray ); for ( TInt i = 0; i< destIdArray.Count(); i++ ) { - RCmDestination dest = iCmManager.DestinationL( destIdArray[i] ); + RCmDestinationExt dest = iCmManagerExt.DestinationL( destIdArray[i] ); CleanupClosePushL( dest ); CleanupCounter++; @@ -408,11 +409,11 @@ RArray destIdArray; CleanupClosePushL( destIdArray ); CleanupCounter++; - iCmManager.AllDestinationsL( destIdArray ); + iCmManagerExt.AllDestinationsL( destIdArray ); for ( TInt i = 0; i< destIdArray.Count(); i++ ) { - RCmDestination dest = iCmManager.DestinationL( destIdArray[i] ); + RCmDestinationExt dest = iCmManagerExt.DestinationL( destIdArray[i] ); CleanupClosePushL( dest ); CleanupCounter++;