--- a/connectivitymodules/SeCon/services/pcd/src/sconbackuprestore.cpp Thu Jul 15 19:35:12 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/src/sconbackuprestore.cpp Thu Aug 19 10:44:03 2010 +0300
@@ -38,12 +38,10 @@
CSConBackupRestore* CSConBackupRestore::NewL( CSConBackupRestoreQueue* aQueue,
const TInt aMaxObjectSize, RFs& aFs )
{
- TRACE_FUNC_ENTRY;
CSConBackupRestore* self = new (ELeave) CSConBackupRestore( aQueue, aFs );
CleanupStack::PushL( self );
self->ConstructL( aMaxObjectSize );
CleanupStack::Pop( self );
- TRACE_FUNC_EXIT;
return self;
}
@@ -76,18 +74,12 @@
//
CSConBackupRestore::~CSConBackupRestore()
{
- TRACE_FUNC_ENTRY;
if( iSBEClient )
{
- if( iSBEClient->IsActive() )
- {
- iSBEClient->Cancel();
- }
-
+ iSBEClient->Cancel();
delete iSBEClient;
iSBEClient = NULL;
}
- TRACE_FUNC_EXIT;
}
// -----------------------------------------------------------------------------
@@ -166,11 +158,7 @@
TRACE_FUNC_ENTRY;
if( iSBEClient )
{
- if( iSBEClient->IsActive() )
- {
- iSBEClient->Cancel();
- }
-
+ iSBEClient->Cancel();
delete iSBEClient;
iSBEClient = NULL;
}
@@ -212,11 +200,9 @@
//
void CSConBackupRestore::RunL()
{
- TRACE_FUNC_ENTRY;
-
+ TRACE_FUNC;
iQueue->CompleteTask( iCurrentTask, iStatus.Int() );
iBackupRestoreActive = EFalse;
- TRACE_FUNC_EXIT;
}
// End of file